adphi/oh-my-zsh
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Better error handling and use of trap

Browse Source
This commit is contained in:
Joel Kuzmarski 2016-08-20 18:22:26 -05:00
parent 5443d8754f
commit 122146bf54
1 changed files with 46 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
tools/install.sh
View File

@ -93,7 +93,7 @@ main() {
ENV_ZSH="$(which zsh)" # $(type -P zsh) would be better but not POSIX sh ENV_ZSH="$(which zsh)" # $(type -P zsh) would be better but not POSIX sh
# Will it blend? # Will it blend?
if [ -z "$("$ENV_ZSH" -c 'echo $ZSH_VERSION')" ]; then if [ -z "$("$ENV_ZSH" -c 'print $ZSH_VERSION')" ]; then
unset ENV_ZSH unset ENV_ZSH
fi fi
@ -106,7 +106,7 @@ main() {
# -- We know at least one is in there because of an earlier check in this script. # -- We know at least one is in there because of an earlier check in this script.
GREP_ZSH="$(grep /zsh$ /etc/shells | tail -1)" GREP_ZSH="$(grep /zsh$ /etc/shells | tail -1)"
# Will it blend? # Will it blend?
if [ -n "$("$GREP_ZSH" -c 'echo $ZSH_VERSION')" ]; then if [ -n "$("$GREP_ZSH" -c 'print $ZSH_VERSION')" ]; then
# Yep, let's use that zsh entry. # Yep, let's use that zsh entry.
CHSH_ZSH="$GREP_ZSH" CHSH_ZSH="$GREP_ZSH"
else else
@ -128,29 +128,36 @@ main() {
# If this platform provides a "chsh" command (not Cygwin), do it, man! # If this platform provides a "chsh" command (not Cygwin), do it, man!
if hash chsh >/dev/null 2>&1; then if hash chsh >/dev/null 2>&1; then
printf "${BLUE}Time to change your default shell to ${CHSH_ZSH}!${NORMAL}\n" printf "${BLUE}Time to change your default shell to ${CHSH_ZSH}!${NORMAL}\n"
# CTRL-C at the chsh password prompt will bubble up and kill this script,
# so we set a benign trap on the INT signal to stop the bubbling.
trap 'true' INT
# We need a while loop so the user can retry after entering a bad password.
while true; do while true; do
set +e # Attempt to change the default login shell.
trap 'CHSH_ZSH_ERRNO=$?' INT CHSH_ZSH_STDERR="$(chsh -s "$CHSH_ZSH" 2>&1)" && {
CHSH_ZSH_STDERR="$(chsh -s "$CHSH_ZSH" 2>&1)"
CHSH_ZSH_ERRNO=${CHSH_ZSH_ERRNO-$?}
case $CHSH_ZSH_ERRNO in
0)
# Great. It worked. # Great. It worked.
printf "${BLUE}Default login shell changed to: ${CHSH_ZSH}\n${NORMAL}"
# Update the $SHELL export for this session. # Update the $SHELL export for this session.
SHELL="$CHSH_ZSH" SHELL="$CHSH_ZSH"
break break
;; } || {
case $? in
# On CTRL-C, chsh returns 130.
130) 130)
# The user cancelled changing the default login shell at the password prompt.
printf "${RED}Change of default login shell has been cancelled!${NORMAL}\n" printf "${RED}Change of default login shell has been cancelled!${NORMAL}\n"
printf "${BLUE}To try again, run the following command at any time:\n${NORMAL}" printf "${BLUE}To try again, run the following command at any time:\n${NORMAL}"
printf ' %schsh -s "%s"%s\n' "${BLUE}" "$CHSH_ZSH" "${NORMAL}" printf ' %schsh -s "%s"%s\n' "${BLUE}" "$CHSH_ZSH" "${NORMAL}"
break break
;; ;;
# Some other error code.
*) *)
case "$CHSH_ZSH_STDERR" in case "$CHSH_ZSH_STDERR" in
# The user entered a wrong password.
*Credentials*) *Credentials*)
printf "${RED}Wrong password.${NORMAL} ${GREEN}Press CTRL-C to cancel.${NORMAL}\n" printf "${RED}Wrong password.${NORMAL} ${GREEN}Press CTRL-C to cancel.${NORMAL}\n"
;; ;;
# Something other unhandled error.
*) *)
printf "${RED}There was a problem changing the default login shell!${NORMAL}\n" printf "${RED}There was a problem changing the default login shell!${NORMAL}\n"
printf "${RED}${CHSH_ZSH_STDERR}${NORMAL}\n" printf "${RED}${CHSH_ZSH_STDERR}${NORMAL}\n"
@ -163,9 +170,10 @@ main() {
esac esac
;; ;;
esac esac
trap - INT }
set -e
done done
# Unset the INT trap.
trap - INT
# Else, suggest the user change the login shell manually. # Else, suggest the user change the login shell manually.
else else
printf "I can't change your shell automatically because this system does not have chsh.\n" printf "I can't change your shell automatically because this system does not have chsh.\n"