Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tools/upgrade: Return to the original working directory after upgrading #286

Merged
merged 2 commits into from
Jan 12, 2022
Merged

tools/upgrade: Return to the original working directory after upgrading #286

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
463b9c3
tools/upgrade: Return to the original working directory after upgrading
akinomyoga Jan 5, 2022
bf6960f
tools/upgrade: Adjust shell quoting
akinomyoga Jan 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 9 additions & 10 deletions tools/upgrade.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ if which tput >/dev/null 2>&1; then
ncolors=$(tput colors)
fi
if [ -t 1 ] && [ -n "$ncolors" ] && [ "$ncolors" -ge 8 ]; then
RED="$(tput setaf 1)"
GREEN="$(tput setaf 2)"
YELLOW="$(tput setaf 3)"
BLUE="$(tput setaf 4)"
BOLD="$(tput bold)"
NORMAL="$(tput sgr0)"
RED=$(tput setaf 1)
GREEN=$(tput setaf 2)
YELLOW=$(tput setaf 3)
BLUE=$(tput setaf 4)
BOLD=$(tput bold)
NORMAL=$(tput sgr0)
else
RED=""
GREEN=""
Expand All @@ -22,9 +22,8 @@ else
fi

printf "${BLUE}%s${NORMAL}\n" "Updating Oh My Bash"
cd "$OSH"
if git pull --rebase --stat origin master
then

if git -C "$OSH" pull --rebase --stat origin master; then
printf '%s' "$GREEN"
printf '%s\n' ' __ __ __ '
printf '%s\n' ' ____ / /_ ____ ___ __ __ / /_ ____ ______/ /_ '
Expand All @@ -34,7 +33,7 @@ then
printf '%s\n' ' /____/ '
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"
exec bash; source $HOME/.bashrc
exec bash; source ~/.bashrc
akinomyoga marked this conversation as resolved.
Show resolved Hide resolved
else
printf "${RED}%s${NORMAL}\n" 'There was an error updating. Try again later?'
fi