From 7d2a10d47e188061c82c43cc7603cca7dd3085c1 Mon Sep 17 00:00:00 2001 From: nemoinho Date: Wed, 29 May 2024 21:43:21 +0000 Subject: [PATCH] Don't abort on when trying to update dotfile-repository --- .config/dotfiles/setup-machine.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.config/dotfiles/setup-machine.sh b/.config/dotfiles/setup-machine.sh index c52054b..1fd6ecb 100755 --- a/.config/dotfiles/setup-machine.sh +++ b/.config/dotfiles/setup-machine.sh @@ -102,10 +102,10 @@ then git clone --separate-git-dir=$GIT_DIR $GIT_REMOTE $HOME/tmp-dotfiles rm -r ~/tmp-dotfiles else - /usr/bin/git --git-dir "$GIT_DIR" --work-tree "$HOME" pull + /usr/bin/git --git-dir "$GIT_DIR" --work-tree "$HOME" pull || true fi -/usr/bin/git --git-dir "$GIT_DIR" --work-tree "$HOME" config --local status.showUntrackedFiles no -/usr/bin/git --git-dir "$GIT_DIR" --work-tree "$HOME" checkout +/usr/bin/git --git-dir "$GIT_DIR" --work-tree "$HOME" config --local status.showUntrackedFiles no || true +/usr/bin/git --git-dir "$GIT_DIR" --work-tree "$HOME" checkout || true # reload bash_profile to configure the current shell with the just installed dotfiles . ~/.bash_profile