From 9b7643564485db10f47f29f6f6c4510028481796 Mon Sep 17 00:00:00 2001 From: nemoinho Date: Mon, 21 Nov 2022 16:25:55 +0000 Subject: [PATCH] Consider an already existing dotfiles-clone in setup-machine.sh --- .config/dotfiles/setup-machine.sh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.config/dotfiles/setup-machine.sh b/.config/dotfiles/setup-machine.sh index 37ec2ac..66a2eaa 100755 --- a/.config/dotfiles/setup-machine.sh +++ b/.config/dotfiles/setup-machine.sh @@ -36,9 +36,14 @@ unset _osname # clone dotfiles for fast startup GIT_DIR=$HOME/Development/nemoinho/gitea.nehrke.info/nemoinho/dotfiles -GIT_REMOTE=git@gitea.nehrke.info:nemoinho/dotfiles.git -git clone --separate-git-dir=$GIT_DIR $GIT_REMOTE $HOME/tmp-dotfiles -rm -r ~/tmp-dotfiles +if [ ! -d "$GIT_DIR" ] +then + GIT_REMOTE=git@gitea.nehrke.info:nemoinho/dotfiles.git + 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 +fi alias config='/usr/bin/git --git-dir=$GIT_DIR --work-tree=$HOME' config config --local status.showUntrackedFiles no config checkout