Fixes for linting

Author: erichlf

home/dot-zshrc

@@ -86,3 +86,7 @@ set -o vi
 
 # Add RVM to PATH for scripting. Make sure this is the last PATH variable change.
 export PATH="$PATH:$HOME/.rvm/bin"
+
+export NVM_DIR="$HOME/.nvm"
+[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
+[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion

scripts/base_install.sh

@@ -3,12 +3,12 @@ function base_install() {
 
   if [[ "$system" == "arch" ]]; then
     INFO "Setting up an arch based system"
-    if [ $(which yay) == "" ]; then
+    if [ "$(which yay)" == "" ]; then
       INFO "Setting up yay..."
       [ ! -d /tmp/yay ] && git clone https://aur.archlinux.org/yay.git /tmp/yay
-      cd /tmp/yay
+      cd /tmp/yay || exit 1
       makepkg -si --noconfirm
-      cd -
+      cd - || exit 1
     else
       INFO "yay already installed"
     fi
@@ -61,12 +61,12 @@ function base_install() {
     python3-setuptools
 
   INFO "Installing NEOVIM..."
-  $alt_install $NEOVIM
+  $alt_install "$NEOVIM"
 
   INFO "Installing LazyVim Dependencies"
   rust_install
   INFO "Installing go"
-  $alt_install $GO
+  $alt_install "$GO"
   INFO "Installing Lazy Dependencies"
   $pkg_install \
     nodejs \
@@ -87,7 +87,7 @@ function base_install() {
   $pkg_install \
     ca-certificates \
     gnupg
-  if [ $system == "arch" ]; then
+  if [ "$system" == "arch" ]; then
     DOCKER_PACKAGES="containerd docker docker-compose"
   else
     $pkg_install \
@@ -103,7 +103,7 @@ function base_install() {
     DOCKER_PACKAGES="containerd.io docker-ce docker-ce-cli docker-buildx-plugin docker-compose-plugin"
   fi
 
-  $pkg_install $DOCKER_PACKAGES
+  $pkg_install "$DOCKER_PACKAGES"
 
   sudo usermod -a -G docker "$USER"
   if [ ! "$CI" ]; then

scripts/devcontainer.sh

@@ -31,7 +31,7 @@ sudo chsh -s /usr/bin/zsh
 
 # ensure that .config is owned by the current user
 if [[ -d $HOME/.config && ! $(stat -c "%U" "$HOME/.config") == "$(whoami)" ]]; then
-  sudo chown $(id -u):$(id -g) "$HOME/.config"
+  sudo chown "$(id -u)":"$(id -g)" "$HOME/.config"
 fi
 
 # create links to dotfiles

scripts/main.sh

@@ -24,7 +24,7 @@ apt_install \
 # git clone [email protected]:erichlf/dotfiles.git
 git submodule update --init --recursive
 
-sudo usermod -s $(which zsh) $(whoami)
+sudo usermod -s "$(which zsh)" "$(whoami)"
 
 cmd=(
   dialog
@@ -77,7 +77,7 @@ function base_sys() {
     signal-desktop \
     slack
 
-  if [ $(which 1password) == "" ]; then
+  if [ "$(which 1password)" == "" ]; then
     INFO "Installing 1password"
     mkdir -p /tmp/1password
     cd /tmp/1password
@@ -87,7 +87,7 @@ function base_sys() {
     rm -rf /tmp/1password
   fi
 
-  if [ $(which vivaldi) == "" ]; then
+  if [ "$(which vivaldi)" == "" ]; then
     INFO "Installing Vivaldi"
     mkdir -p /tmp/vivaldi
     cd /tmp/vivaldi
@@ -137,20 +137,20 @@ function havoc() {
   go install google.golang.org/protobuf/cmd/protoc-gen-go@latest
   go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@latest
 
-  if [ ! -d $HOME/.local/balena ]; then
+  if [ ! -d "$HOME/.local/balena" ]; then
     INFO "Installing balena"
-    mkdir -p $HOME/.local
+    mkdir -p "$HOME/.local"
     mkdir -p /tmp/balena
     cd /tmp/balena
     RELEASE=v22.1.1
     BALENA="balena-cli-$RELEASE-linux-x64-standalone.tar.gz"
     wget https://github.com/balena-io/balena-cli/releases/download/$RELEASE/$BALENA
     tar xzvf $BALENA
-    mv balena $HOME/.local/
+    mv balena "$HOME/.local/"
     rm -rf /tmp/balena
   fi
 
-  if [ $(which aws) == "" ]; then
+  if [ "$(which aws)" == "" ]; then
     INFO "Installing AWS"
     mkdir -p /tmp/aws
     cd /tmp/aws
@@ -182,7 +182,7 @@ function havoc() {
   apt_update
   apt_install tailscale
 
-  if [ $(which foxglove) == "" ]; then
+  if [ "$(which foxglove)" == "" ]; then
     INFO "Install foxglove"
     mkdir -p /tmp/foxglove
     cd /tmp/foxglove
@@ -195,9 +195,9 @@ function havoc() {
   INFO "Installing wireshark"
   apt_install wireshark
 
-  if [ $(which QGroundControl) == "" ]; then
+  if [ "$(which QGroundControl)" == "" ]; then
     INFO "Installing QGroundControl"
-    sudo usermod -a -G dialout $USER
+    sudo usermod -a -G dialout "$USER"
     sudo apt-get remove modemmanager -y
     apt_install \
       gstreamer1.0-gl \

scripts/nas.sh

@@ -4,7 +4,7 @@ DOTFILES_DIR=$(pwd)
 
 set -e
 
-cd $(dirname $0)/..
+cd "$(dirname "$0")/.."
 DOTFILES_DIR=$(pwd)
 
 source "$DOTFILES_DIR/scripts/utils.sh"
@@ -23,7 +23,7 @@ pac_install \
 # git clone [email protected]:erichlf/dotfiles.git
 git submodule update --init --recursive
 
-sudo usermod -s $(which zsh) $(whoami)
+sudo usermod -s "$(which zsh)" "$(whoami)"
 
 pac_update