From ca5632bce10e1f5b0fe2a59151ae0fd776619d89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Cornell=C3=A0?= Date: Wed, 21 Oct 2015 10:44:56 +0200 Subject: [PATCH 1/7] Fix syntax error in #4515 on certain shells Drops the `function` keyword and uses only `func(){}` syntax as per the POSIX specification: http://pubs.opengroup.org/onlinepubs/009695399/utilities/xcu_chap02.html#tag_02_09_05 Related: #4531 --- tools/install.sh | 232 ++++++++++++++++++++++++----------------------- 1 file changed, 118 insertions(+), 114 deletions(-) diff --git a/tools/install.sh b/tools/install.sh index be43968bc..8cba52085 100755 --- a/tools/install.sh +++ b/tools/install.sh @@ -1,118 +1,122 @@ -# Use colors, but only if connected to a terminal, and that terminal -# supports them. -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)" -else - RED="" - GREEN="" - YELLOW="" - BLUE="" - BOLD="" - NORMAL="" -fi - -# Only enable exit-on-error after the non-critical colorization stuff, -# which may fail on systems lacking tput or terminfo -set -e - -CHECK_ZSH_INSTALLED=$(grep /zsh$ /etc/shells | wc -l) -if [ ! $CHECK_ZSH_INSTALLED -ge 1 ]; then - printf "${YELLOW}Zsh is not installed!${NORMAL} Please install zsh first!\n" - exit -fi -unset CHECK_ZSH_INSTALLED - -if [ ! -n "$ZSH" ]; then - ZSH=~/.oh-my-zsh -fi - -if [ -d "$ZSH" ]; then - printf "${YELLOW}You already have Oh My Zsh installed.${NORMAL}\n" - printf "You'll need to remove $ZSH if you want to re-install.\n" - 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 || { - echo "Error: git is not installed" - exit 1 -} -env git clone --depth=1 https://github.com/robbyrussell/oh-my-zsh.git $ZSH || { - printf "Error: git clone of oh-my-zsh repo failed\n" - exit 1 -} - -# The Windows (MSYS) Git is not compatible with normal use on cygwin -if [ "$OSTYPE" = cygwin ]; then - if git --version | grep msysgit > /dev/null; then - echo "Error: Windows/MSYS Git is not supported on Cygwin" - echo "Error: Make sure the Cygwin git package is installed and is first on the path" - exit 1 +main() { + # Use colors, but only if connected to a terminal, and that terminal + # supports them. + if which tput >/dev/null 2>&1; then + ncolors=$(tput colors) fi -fi - -printf "${BLUE}Looking for an existing zsh config...${NORMAL}\n" -if [ -f ~/.zshrc ] || [ -h ~/.zshrc ]; then - printf "${YELLOW}Found ~/.zshrc.${NORMAL} ${GREEN}Backing up to ~/.zshrc.pre-oh-my-zsh${NORMAL}\n"; - mv ~/.zshrc ~/.zshrc.pre-oh-my-zsh; -fi - -printf "${BLUE}Using the Oh My Zsh template file and adding it to ~/.zshrc${NORMAL}\n" -cp $ZSH/templates/zshrc.zsh-template ~/.zshrc -sed "/^export ZSH=/ c\\ -export ZSH=$ZSH -" ~/.zshrc > ~/.zshrc-omztemp -mv -f ~/.zshrc-omztemp ~/.zshrc - -printf "${BLUE}Copying your current PATH and adding it to the end of ~/.zshrc for you.${NORMAL}\n" -sed "/export PATH=/ c\\ -export PATH=\"$PATH\" -" ~/.zshrc > ~/.zshrc-omztemp -mv -f ~/.zshrc-omztemp ~/.zshrc - -# If this user's login shell is not already "zsh", attempt to switch. -TEST_CURRENT_SHELL=$(expr "$SHELL" : '.*/\(.*\)') -if [ "$TEST_CURRENT_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. + 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)" else - printf "I can't change your shell automatically because this system does not have chsh.\n" - printf "${BLUE}Please manually change your default shell to zsh!${NORMAL}\n" + RED="" + GREEN="" + YELLOW="" + BLUE="" + BOLD="" + NORMAL="" fi -fi -printf "${GREEN}" -echo ' __ __ ' -echo ' ____ / /_ ____ ___ __ __ ____ _____/ /_ ' -echo ' / __ \/ __ \ / __ `__ \/ / / / /_ / / ___/ __ \ ' -echo '/ /_/ / / / / / / / / / / /_/ / / /_(__ ) / / / ' -echo '\____/_/ /_/ /_/ /_/ /_/\__, / /___/____/_/ /_/ ' -echo ' /____/ ....is now installed!' -echo '' -echo '' -echo 'Please look over the ~/.zshrc file to select plugins, themes, and options.' -echo '' -echo 'p.s. Follow us at https://twitter.com/ohmyzsh.' -echo '' -echo 'p.p.s. Get stickers and t-shirts at http://shop.planetargon.com.' -echo '' -printf "${NORMAL}" -env zsh + # Only enable exit-on-error after the non-critical colorization stuff, + # which may fail on systems lacking tput or terminfo + set -e + + CHECK_ZSH_INSTALLED=$(grep /zsh$ /etc/shells | wc -l) + if [ ! $CHECK_ZSH_INSTALLED -ge 1 ]; then + printf "${YELLOW}Zsh is not installed!${NORMAL} Please install zsh first!\n" + exit + fi + unset CHECK_ZSH_INSTALLED + + if [ ! -n "$ZSH" ]; then + ZSH=~/.oh-my-zsh + fi + + if [ -d "$ZSH" ]; then + printf "${YELLOW}You already have Oh My Zsh installed.${NORMAL}\n" + printf "You'll need to remove $ZSH if you want to re-install.\n" + 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 || { + echo "Error: git is not installed" + exit 1 + } + env git clone --depth=1 https://github.com/robbyrussell/oh-my-zsh.git $ZSH || { + printf "Error: git clone of oh-my-zsh repo failed\n" + exit 1 + } + + # The Windows (MSYS) Git is not compatible with normal use on cygwin + if [ "$OSTYPE" = cygwin ]; then + if git --version | grep msysgit > /dev/null; then + echo "Error: Windows/MSYS Git is not supported on Cygwin" + echo "Error: Make sure the Cygwin git package is installed and is first on the path" + exit 1 + fi + fi + + printf "${BLUE}Looking for an existing zsh config...${NORMAL}\n" + if [ -f ~/.zshrc ] || [ -h ~/.zshrc ]; then + printf "${YELLOW}Found ~/.zshrc.${NORMAL} ${GREEN}Backing up to ~/.zshrc.pre-oh-my-zsh${NORMAL}\n"; + mv ~/.zshrc ~/.zshrc.pre-oh-my-zsh; + fi + + printf "${BLUE}Using the Oh My Zsh template file and adding it to ~/.zshrc${NORMAL}\n" + cp $ZSH/templates/zshrc.zsh-template ~/.zshrc + sed "/^export ZSH=/ c\\ + export ZSH=$ZSH + " ~/.zshrc > ~/.zshrc-omztemp + mv -f ~/.zshrc-omztemp ~/.zshrc + + printf "${BLUE}Copying your current PATH and adding it to the end of ~/.zshrc for you.${NORMAL}\n" + sed "/export PATH=/ c\\ + export PATH=\"$PATH\" + " ~/.zshrc > ~/.zshrc-omztemp + mv -f ~/.zshrc-omztemp ~/.zshrc + + # If this user's login shell is not already "zsh", attempt to switch. + TEST_CURRENT_SHELL=$(expr "$SHELL" : '.*/\(.*\)') + if [ "$TEST_CURRENT_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 "I can't change your shell automatically because this system does not have chsh.\n" + printf "${BLUE}Please manually change your default shell to zsh!${NORMAL}\n" + fi + fi + + printf "${GREEN}" + echo ' __ __ ' + echo ' ____ / /_ ____ ___ __ __ ____ _____/ /_ ' + echo ' / __ \/ __ \ / __ `__ \/ / / / /_ / / ___/ __ \ ' + echo '/ /_/ / / / / / / / / / / /_/ / / /_(__ ) / / / ' + echo '\____/_/ /_/ /_/ /_/ /_/\__, / /___/____/_/ /_/ ' + echo ' /____/ ....is now installed!' + echo '' + echo '' + echo 'Please look over the ~/.zshrc file to select plugins, themes, and options.' + echo '' + echo 'p.s. Follow us at https://twitter.com/ohmyzsh.' + echo '' + echo 'p.p.s. Get stickers and t-shirts at http://shop.planetargon.com.' + echo '' + printf "${NORMAL}" + env zsh +} + +main From b2010a0ae63ba09632a3b427edc81888eadec4d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Cornell=C3=A0?= Date: Wed, 21 Oct 2015 11:17:37 +0200 Subject: [PATCH 2/7] Fix syntax error in confirmation prompt of uninstall.sh We need to use POSIX syntax. This file is no longer executed with zsh. Fixes #4483. --- tools/uninstall.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/uninstall.sh b/tools/uninstall.sh index f9da00c9b..488b002e7 100644 --- a/tools/uninstall.sh +++ b/tools/uninstall.sh @@ -1,8 +1,8 @@ read -r -p "Are you sure you want to remove Oh My Zsh? [y/N] " confirmation -if ! [[ $confirmation =~ ^[yY]$ ]] +if [ $confirmation = y ] && [ $confirmation = Y ] then - echo "Uninstall cancelled" - exit + echo "Uninstall cancelled" + exit fi echo "Removing ~/.oh-my-zsh" From 4e42e1f7e149f85ba52b654dbea9766080a9a480 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Cornell=C3=A0?= Date: Wed, 21 Oct 2015 11:28:12 +0200 Subject: [PATCH 3/7] Fix conditional in uninstall prompt --- tools/uninstall.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/uninstall.sh b/tools/uninstall.sh index 488b002e7..80b11a10a 100644 --- a/tools/uninstall.sh +++ b/tools/uninstall.sh @@ -1,5 +1,5 @@ read -r -p "Are you sure you want to remove Oh My Zsh? [y/N] " confirmation -if [ $confirmation = y ] && [ $confirmation = Y ] +if [ $confirmation = y ] || [ $confirmation = Y ] then echo "Uninstall cancelled" exit From a1755e652cd96efb22b4956e8ef9759d7d170f5d Mon Sep 17 00:00:00 2001 From: Satoshi Ohmori Date: Fri, 16 Oct 2015 04:49:53 +0900 Subject: [PATCH 4/7] Refactor for method in plugins/rake-fast/rake-fast.plugin.zsh --- plugins/rake-fast/rake-fast.plugin.zsh | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/plugins/rake-fast/rake-fast.plugin.zsh b/plugins/rake-fast/rake-fast.plugin.zsh index cfc9a079f..d305eb1f0 100644 --- a/plugins/rake-fast/rake-fast.plugin.zsh +++ b/plugins/rake-fast/rake-fast.plugin.zsh @@ -8,17 +8,7 @@ _rake_refresh () { } _rake_does_task_list_need_generating () { - if [ ! -f .rake_tasks ]; then return 0; - else - if [[ "$OSTYPE" = darwin* ]]; then - accurate=$(stat -f%m .rake_tasks) - changed=$(stat -f%m Rakefile) - else - accurate=$(stat -c%Y .rake_tasks) - changed=$(stat -c%Y Rakefile) - fi - return $(expr $accurate '>=' $changed) - fi + [[ ! -f .rake_tasks ]] || [[ Rakefile -nt .rake_tasks ]] } _rake_generate () { From d06f4d089302ecd448eaa557baf6ed4fca34428b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Cornell=C3=A0?= Date: Wed, 21 Oct 2015 16:44:26 +0200 Subject: [PATCH 5/7] Fix backwards logic in uninstaller once and for all Really this time :P Fixes #4533 --- tools/uninstall.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/uninstall.sh b/tools/uninstall.sh index 80b11a10a..9ad1b64a6 100644 --- a/tools/uninstall.sh +++ b/tools/uninstall.sh @@ -1,5 +1,5 @@ read -r -p "Are you sure you want to remove Oh My Zsh? [y/N] " confirmation -if [ $confirmation = y ] || [ $confirmation = Y ] +if [ "$confirmation" != y ] && [ "$confirmation" != Y ] then echo "Uninstall cancelled" exit From 9264d75d5d1c10de370b0c32606b70768541eaaa Mon Sep 17 00:00:00 2001 From: Cooper Maruyama Date: Mon, 15 Jun 2015 01:22:40 -0700 Subject: [PATCH 6/7] Fix typo. * `cfp` alias was referencing an old version of the `cf` command which no longer exists. This has been updated to reference a valid command. --- plugins/coffee/coffee.plugin.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/coffee/coffee.plugin.zsh b/plugins/coffee/coffee.plugin.zsh index 77cb663f7..6d1ce5ce4 100644 --- a/plugins/coffee/coffee.plugin.zsh +++ b/plugins/coffee/coffee.plugin.zsh @@ -10,7 +10,7 @@ cfc () { } # compile from clipboard & print -alias cfp='coffeeMe "$(clippaste)"' +alias cfp='cf "$(clippaste)"' # compile from clipboard and copy to clipboard alias cfpc='cfp | clipcopy' From e9de366ea7f20962f1847828b3ca185bab69a118 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Cornell=C3=A0?= Date: Wed, 21 Oct 2015 17:39:13 +0200 Subject: [PATCH 7/7] Update custom location command and fix code format --- README.markdown | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/README.markdown b/README.markdown index 779ce77c3..cee314de2 100644 --- a/README.markdown +++ b/README.markdown @@ -25,11 +25,15 @@ Oh My Zsh is installed by running one of the following commands in your terminal #### via curl -`sh -c "$(curl -fsSL https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh)"` +```shell +sh -c "$(curl -fsSL https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh)" +``` #### via wget -`sh -c "$(wget https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh -O -)"` +```shell +sh -c "$(wget https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh -O -)" +``` ## Using Oh My Zsh @@ -100,7 +104,7 @@ The default location is `~/.oh-my-zsh` (hidden in your home directory) If you'd like to change the install directory with the `ZSH` environment variable, either by running `export ZSH=/your/path` before installing, or by setting it before the end of the install pipeline like this: ```shell -curl -L https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh | ZSH=~/.dotfiles/zsh sh +export ZSH="~/.dotfiles/oh-my-zsh"; sh -c "$(curl -fsSL https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh)" ``` #### Manual Installation