summaryrefslogtreecommitdiff
path: root/tools/upgrade.sh
diff options
context:
space:
mode:
Diffstat (limited to 'tools/upgrade.sh')
-rw-r--r--tools/upgrade.sh6
1 files changed, 1 insertions, 5 deletions
diff --git a/tools/upgrade.sh b/tools/upgrade.sh
index 0aeebdebf..e04fc672f 100644
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh
@@ -1,9 +1,6 @@
-current_path=`pwd`
-current_path=${current_path/ /\\ }
printf '\033[0;34m%s\033[0m\n' "Upgrading Oh My Zsh"
cd "$ZSH"
-
-if git pull origin master
+if git pull --rebase origin master
then
printf '\033[0;32m%s\033[0m\n' ' __ __ '
printf '\033[0;32m%s\033[0m\n' ' ____ / /_ ____ ___ __ __ ____ _____/ /_ '
@@ -17,4 +14,3 @@ else
printf '\033[0;31m%s\033[0m\n' 'There was an error updating. Try again later?'
fi
-cd "$current_path"