From 0e4af5d5962ed4aa532f45ae6dbbdd1c5c012407 Mon Sep 17 00:00:00 2001 From: Josh Lay Date: Tue, 18 Jun 2024 08:28:13 -0500 Subject: [PATCH] update: robustness, include Sway --- update.sh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/update.sh b/update.sh index c0f37cb..1f33e97 100755 --- a/update.sh +++ b/update.sh @@ -3,13 +3,15 @@ # minimal dotfile manager # tracks files / copies them into the repo, sorted by hostname # +set -u # array of files [relative to home] to include DOTS=( '.vimrc' '.config/nvim/init.vim' '.config/nvim/coc-settings.json' - # '.config/sway' + '.config/autostart-i3ipc.yml' + '.config/sway' ) # ensure the host running this script/updating dotfiles has a directory @@ -18,13 +20,16 @@ DOTS=( [ -d "$HOSTNAME" ] || mkdir -v "$HOSTNAME" pushd "$HOSTNAME" || exit +echo "Changed working dir to $PWD" + # now that the host/working dir is managed, process the dotfiles # ensure their directory structure is retained, then recursively copy for DOT in "${DOTS[@]}"; do DOT_DIR="$(dirname "$DOT")" [ -d "$DOT_DIR" ] || mkdir -vp "$DOT_DIR" - # naively copy; rely on git to tell us about changes - cp -ravp "$HOME/$DOT" "$DOT" + # naively 'copy' with rsync; rely on git to tell us about changes. TODO: reconsider + echo "Copying '$HOME/$DOT' to '$DOT'" + rsync -aqv "$HOME/$DOT" "$DOT" || echo "Couldn't copy '$DOT', got rc: $?" done # return where we were