diff options
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/install.sh | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/tools/install.sh b/tools/install.sh index e8dffe3c7..4b1a6ba7e 100755 --- a/tools/install.sh +++ b/tools/install.sh @@ -20,7 +20,7 @@ else fi CHECK_ZSH_INSTALLED=$(grep /zsh$ /etc/shells | wc -l) if [ ! $CHECK_ZSH_INSTALLED -ge 1 ]; then - echo "${YELLOW}Zsh is not installed!${NORMAL} Please install zsh first!" + printf "${YELLOW}Zsh is not installed!${NORMAL} Please install zsh first!\n" exit fi unset CHECK_ZSH_INSTALLED @@ -35,6 +35,13 @@ if [ -d "$ZSH" ]; then exit fi +# Prevent the cloned repository from having insecure permissions. Failing to do +# so causes compinit() calls to fail with "command not found: compdef" errors +# for users with insecure umasks (e.g., "002", allowing group writability). Note +# that this will be ignored under Cygwin by default, as Windows ACLs take +# precedence over umasks except for filesystems mounted with option "noacl". +umask g-w,o-w + printf "${BLUE}Cloning Oh My Zsh...${NORMAL}\n" hash git >/dev/null 2>&1 && env git clone --depth=1 https://github.com/robbyrussell/oh-my-zsh.git $ZSH || { printf "git not installed\n" @@ -60,12 +67,17 @@ export PATH=\"$PATH\" " ~/.zshrc > ~/.zshrc-omztemp mv -f ~/.zshrc-omztemp ~/.zshrc -TEST_CURRENT_SHELL=$(expr "$SHELL" : '.*/\(.*\)') -if [ "$TEST_CURRENT_SHELL" != "zsh" ]; then +# If this user's login shell is not already "zsh", attempt to switch. +if [ "$(expr "$SHELL" : '.*/\(.*\)')" != "zsh" ]; then + # If this platform provides a "chsh" command (not Cygwin), do it, man! + if hash chsh >/dev/null 2>&1; then printf "${BLUE}Time to change your default shell to zsh!${NORMAL}\n" chsh -s $(grep /zsh$ /etc/shells | tail -1) + # Else, suggest the user do so manually. + else + printf "${BLUE}Please manually change your default shell to zsh!${NORMAL}\n" + fi fi -unset TEST_CURRENT_SHELL printf "${GREEN}" echo ' __ __ ' |