From d991c9acfbe481a7b56cbc231cb55ed004a33a97 Mon Sep 17 00:00:00 2001 From: Evie Litherland-Smith Date: Thu, 19 Dec 2024 11:09:45 +0000 Subject: [PATCH] Fix order of checks in sync-emacs --- system/home/scripts/shell/rsync-local-config.sh | 0 system/home/scripts/shell/sync-emacs.sh | 2 +- system/home/scripts/shell/sync-git.sh | 0 system/home/scripts/shell/xdg-query-program.sh | 0 4 files changed, 1 insertion(+), 1 deletion(-) mode change 100755 => 100644 system/home/scripts/shell/rsync-local-config.sh mode change 100755 => 100644 system/home/scripts/shell/sync-git.sh mode change 100755 => 100644 system/home/scripts/shell/xdg-query-program.sh diff --git a/system/home/scripts/shell/rsync-local-config.sh b/system/home/scripts/shell/rsync-local-config.sh old mode 100755 new mode 100644 diff --git a/system/home/scripts/shell/sync-emacs.sh b/system/home/scripts/shell/sync-emacs.sh index c87c1b91..f1ae42fd 100644 --- a/system/home/scripts/shell/sync-emacs.sh +++ b/system/home/scripts/shell/sync-emacs.sh @@ -1,6 +1,6 @@ # Clone ~/.config/emacs/ if it doesn't exist EMACS_DIR="${XDG_CONFIG_HOME:-$HOME/.config}/emacs" -if [ ! -d "$EMACS_DIR" ]; then +if [ -d "$EMACS_DIR" ]; then git -C "$EMACS_DIR" pull --ff --ff-only else git clone "https://git.xenia.me.uk/pixelifytica/emacs.git" "$EMACS_DIR" diff --git a/system/home/scripts/shell/sync-git.sh b/system/home/scripts/shell/sync-git.sh old mode 100755 new mode 100644 diff --git a/system/home/scripts/shell/xdg-query-program.sh b/system/home/scripts/shell/xdg-query-program.sh old mode 100755 new mode 100644