shell-user/oh-my-bash
1
0
Fork 0
mirror of https://github.com/ohmybash/oh-my-bash.git synced 2024-05-11 05:55:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #286 from akinomyoga/return-to-original-cwd

Browse Source 
tools/upgrade: Return to the original working directory after upgrading
This commit is contained in:
Koichi Murase
2022-01-12 19:45:11 +09:00
committed by GitHub
parent 56f692daf0 bf6960f347
commit 51864b9a09
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
tools/upgrade.sh
View File

@@ -6,12 +6,12 @@ if which tput >/dev/null 2>&1; then
ncolors=$(tput colors) ncolors=$(tput colors)
fi fi
if [ -t 1 ] && [ -n "$ncolors" ] && [ "$ncolors" -ge 8 ]; then if [ -t 1 ] && [ -n "$ncolors" ] && [ "$ncolors" -ge 8 ]; then
RED="$(tput setaf 1)" RED=$(tput setaf 1)
GREEN="$(tput setaf 2)" GREEN=$(tput setaf 2)
YELLOW="$(tput setaf 3)" YELLOW=$(tput setaf 3)
BLUE="$(tput setaf 4)" BLUE=$(tput setaf 4)
BOLD="$(tput bold)" BOLD=$(tput bold)
NORMAL="$(tput sgr0)" NORMAL=$(tput sgr0)
else else
RED="" RED=""
GREEN="" GREEN=""
@@ -22,9 +22,8 @@ else
fi fi
printf "${BLUE}%s${NORMAL}\n" "Updating Oh My Bash" printf "${BLUE}%s${NORMAL}\n" "Updating Oh My Bash"
cd "$OSH"
if git pull --rebase --stat origin master if git -C "$OSH" pull --rebase --stat origin master; then
then
printf '%s' "$GREEN" printf '%s' "$GREEN"
printf '%s\n' ' __ __ __ ' printf '%s\n' ' __ __ __ '
printf '%s\n' ' ____ / /_ ____ ___ __ __ / /_ ____ ______/ /_ ' printf '%s\n' ' ____ / /_ ____ ___ __ __ / /_ ____ ______/ /_ '
@@ -34,7 +33,7 @@ then
printf '%s\n' ' /____/ ' printf '%s\n' ' /____/ '
printf "${BLUE}%s\n" "Hooray! Oh My Bash has been updated and/or is at the current version." printf "${BLUE}%s\n" "Hooray! Oh My Bash has been updated and/or is at the current version."
printf "${BLUE}${BOLD}%s${NORMAL}\n" "To keep up on the latest news and updates, follow us on GitHub: https://github.com/ohmybash/oh-my-bash" printf "${BLUE}${BOLD}%s${NORMAL}\n" "To keep up on the latest news and updates, follow us on GitHub: https://github.com/ohmybash/oh-my-bash"
exec bash; source $HOME/.bashrc exec bash; source ~/.bashrc
else else
printf "${RED}%s${NORMAL}\n" 'There was an error updating. Try again later?' printf "${RED}%s${NORMAL}\n" 'There was an error updating. Try again later?'
fi fi