diff --git a/setup.sh b/setup.sh index 21c441d..b4f5e14 100755 --- a/setup.sh +++ b/setup.sh @@ -105,7 +105,11 @@ if [[ ! -d "$env_shared_dir" ]]; then cp -v "$env_shared_dir"/bin-shared/* ~/bin/ else echo -e "`date` - Already installed, updating." - update-shared + git -C "$env_shared_dir" switch "$branch" + git -C "$env_shared_dir" pull --recurse-submodules || \ + ( echo "Failed to pull project, exiting." && return 1 ) + cp -v "$env_shared_dir"/rc_shared.sh ~/.rc_shared + cp -v "$env_shared_dir"/vimrc.vim ~/.vimrc fi