dotfiles.git

@@ -1,8 +1,8 @@

 #!/usr/bin/env bash

 set -eu -o pipefail # See: https://sipb.mit.edu/doc/safe-shell/

-declare -r SCRIPT_NAME=$(basename "$BASH_SOURCE")

-declare -r backup_dir=$HOME/backup_of_dotfiles_$(date "+%Y-%m-%d_%H%M%S")

+declare -r SCRIPT_NAME=$(basename "${BASH_SOURCE[0]}")

+declare -r backup_dir="$HOME"/backup_of_dotfiles_$(date "+%Y-%m-%d_%H%M%S")

 declare -a dotfiles=(".bashrc" ".bash_profile" ".vimrc" ".editrc" ".gitconfig"

                      ".gitignore" ".inputrc" ".tmux.conf" ".ssh/config" ".ripgreprc"

                      ".gdbinit" ".config/gitui/key_bindings.ron" ".visidatarc"

@@ -29,23 +29,23 @@ do

   esac

 done

-if [ ! -d $backup_dir/.ssh ]; then

-    ((DRY_RUN==0)) && mkdir -p $backup_dir/.ssh

+if [ ! -d "${backup_dir}"/.ssh ]; then

+    ((DRY_RUN==0)) && mkdir -p "${backup_dir}"/.ssh

 fi

 # Move original dot files to backup

 for i in "${dotfiles[@]}"

 do

-    if [ -e $HOME/"$i" ]; then

-        if ! cmp --silent $HOME/"$i" "$i" ; then

+    if [ -e "$HOME"/"$i" ]; then

+        if ! cmp --silent "$HOME"/"$i" "$i" ; then

             echo "$i" will be changed as follows:

-            diff $HOME/"$i" "$i" || true

+            diff "$HOME"/"$i" "$i" || true

             if [ $DRY_RUN -eq 0 ]; then

-                mv $HOME/"$i" $backup_dir/"$i"

+                mv "$HOME"/"$i" "${backup_dir}"/"$i"

                 # Consider using symbolic links instead

                 # so pulling updates automatically apply

-                cp "$i" $HOME/"$i"

-                echo "# vimdiff \"$HOME/$i\" \"$backup_dir/$i\""

+                cp "$i" "$HOME"/"$i"

+                echo "# vimdiff \"$HOME/$i\" \"${backup_dir}/$i\""

             else

                 # Provide a diff that can still be used

                 echo "# vimdiff \"$i\" \"$HOME/$i\""

@@ -56,24 +56,24 @@ do

         fi

     else

         echo "$i" will be added to HOME.

-        ((DRY_RUN==0)) && mkdir -p $HOME/$(dirname "$i") && cp "$i" $HOME/"$i"

+        ((DRY_RUN==0)) && mkdir -p "$HOME"/"$(dirname "$i")" && cp "$i" "$HOME"/"$i"

     fi

 done

-if ! diff -qr $HOME/.vim .vim > /dev/null ; then

+if ! diff -qr "$HOME"/.vim .vim > /dev/null ; then

     if [ $DRY_RUN -eq 0 ]; then

-        if [ -d $HOME/.vim ]; then

-            mv $HOME/.vim $backup_dir

+        if [ -d "$HOME"/.vim ]; then

+            mv "$HOME"/.vim "${backup_dir}"

         fi

-        cp -r .vim $HOME

-        if [ -d $backup_dir/.vim ]; then

+        cp -r .vim "$HOME"

+        if [ -d "${backup_dir}"/.vim ]; then

             # Copy back proprietary file types (ex. ftdetect/my.vim), if any.

             # Print only the files that got moved back into ~/.vim

-            cp -rnv $backup_dir/.vim $HOME | grep " -> " | cut -d " " -f3 | \

+            cp -rnv "${backup_dir}"/.vim "$HOME" | grep " -> " | cut -d " " -f3 | \

                 xargs -I{} sh -c "test -f {} && echo Restored {}" || true

         fi

     fi

-    if [[ -d $backup_dir/.vim ]]; then

+    if [[ -d "${backup_dir}"/.vim ]]; then

         if ! diff -qr "$backup_dir/.vim" "$HOME/.vim" ; then

             echo "# diff -qr \"$backup_dir/.vim\" \"$HOME/.vim\""

             echo

@@ -81,30 +81,30 @@ if ! diff -qr $HOME/.vim .vim > /dev/null ; then

             echo No change to the .vim/ directories after restoring proprietary files.

         fi

     else

-        echo No $backup_dir/.vim/ from which to restore proprietary files \(yet\).

+        echo No "${backup_dir}"/.vim/ from which to restore proprietary files \(yet\).

     fi

 else

     echo No change to the .vim/ directories.

 fi

 # Make a directory for vim undo

-if [ ! -d $HOME/.vim_undo ]; then

-    ((DRY_RUN==0)) && mkdir -p $HOME/.vim_undo

+if [ ! -d "$HOME"/.vim_undo ]; then

+    ((DRY_RUN==0)) && mkdir -p "$HOME"/.vim_undo

 fi

 # I have device local secrets in .localrc and a github secret in .gitconfig.local

 for i in ".gitconfig.local" ".localrc"

 do

-    if [ ! -f $HOME/"$i" ]; then

+    if [ ! -f "$HOME"/"$i" ]; then

         echo Consider copying $i from a similar acct. \(\'touch \"\$HOME/$i\"\' to hide this msg.\)

     fi

 done

 if [ $DRY_RUN -eq 0 ]; then

-    echo Your old dotfiles are backed up to $backup_dir

+    echo Your old dotfiles are backed up to "${backup_dir}"

     echo Done. Check http://config.dlma.com for more.

 else

-    echo Your old dotfiles would have been backed up to $backup_dir

+    echo Your old dotfiles would have been backed up to "${backup_dir}"

     echo Dry run completed.

 fi