summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/check_for_upgrade.sh6
-rwxr-xr-xtools/install.sh210
-rw-r--r--tools/uninstall.sh25
-rw-r--r--tools/upgrade.sh3
4 files changed, 123 insertions, 121 deletions
diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
index 5afd83c1e..881bc6c49 100644
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@@ -26,6 +26,9 @@ fi
# oh-my-zsh directory.
[[ -w "$ZSH" ]] || return 0
+# Cancel upgrade if git is unavailable on the system
+whence git >/dev/null || return 0
+
if [ -f ~/.zsh-update ]
then
. ~/.zsh-update
@@ -43,7 +46,7 @@ then
else
echo "[Oh My Zsh] Would you like to check for updates? [Y/n]: \c"
read line
- if [ "$line" = Y ] || [ "$line" = y ] || [ -z "$line" ]; then
+ if [[ "$line" == Y* ]] || [[ "$line" == y* ]] || [ -z "$line" ]; then
_upgrade_zsh
else
_update_zsh_update
@@ -54,4 +57,3 @@ else
# create the zsh file
_update_zsh_update
fi
-
diff --git a/tools/install.sh b/tools/install.sh
index 5633320a8..8cba52085 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -1,116 +1,122 @@
-set -e
+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
+ 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
-# Use colors, but only if connected to a terminal, and that terminal
-# supports them.
-tput=$(which tput)
-if [ -n "$tput" ]; 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
-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
+ # Only enable exit-on-error after the non-critical colorization stuff,
+ # which may fail on systems lacking tput or terminfo
+ set -e
-if [ ! -n "$ZSH" ]; then
- ZSH=~/.oh-my-zsh
-fi
+ 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 [ -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
+ if [ ! -n "$ZSH" ]; then
+ ZSH=~/.oh-my-zsh
+ 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
+ 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
-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
-}
+ # 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
-# 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"
+ 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
-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}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}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
+ 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"
+ # 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
-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
+ 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
diff --git a/tools/uninstall.sh b/tools/uninstall.sh
index f9da00c9b..bf2244be8 100644
--- a/tools/uninstall.sh
+++ b/tools/uninstall.sh
@@ -1,34 +1,29 @@
read -r -p "Are you sure you want to remove Oh My Zsh? [y/N] " confirmation
-if ! [[ $confirmation =~ ^[yY]$ ]]
-then
- echo "Uninstall cancelled"
- exit
+if [ "$confirmation" != y ] && [ "$confirmation" != Y ]; then
+ echo "Uninstall cancelled"
+ exit
fi
echo "Removing ~/.oh-my-zsh"
-if [ -d ~/.oh-my-zsh ]
-then
+if [ -d ~/.oh-my-zsh ]; then
rm -rf ~/.oh-my-zsh
fi
echo "Looking for original zsh config..."
-if [ -f ~/.zshrc.pre-oh-my-zsh ] || [ -h ~/.zshrc.pre-oh-my-zsh ]
-then
+if [ -f ~/.zshrc.pre-oh-my-zsh ] || [ -h ~/.zshrc.pre-oh-my-zsh ]; then
echo "Found ~/.zshrc.pre-oh-my-zsh -- Restoring to ~/.zshrc";
- if [ -f ~/.zshrc ] || [ -h ~/.zshrc ]
- then
- ZSHRC_SAVE=".zshrc.omz-uninstalled-`date +%Y%m%d%H%M%S`";
+ if [ -f ~/.zshrc ] || [ -h ~/.zshrc ]; then
+ ZSHRC_SAVE=".zshrc.omz-uninstalled-$(date +%Y%m%d%H%M%S)";
echo "Found ~/.zshrc -- Renaming to ~/${ZSHRC_SAVE}";
- mv ~/.zshrc ~/${ZSHRC_SAVE};
+ mv ~/.zshrc ~/"${ZSHRC_SAVE}";
fi
mv ~/.zshrc.pre-oh-my-zsh ~/.zshrc;
- source ~/.zshrc;
+ echo "Your original zsh config was restored. Please restart your session."
else
- if hash chsh >/dev/null 2>&1
- then
+ if hash chsh >/dev/null 2>&1; then
echo "Switching back to bash"
chsh -s /bin/bash
else
diff --git a/tools/upgrade.sh b/tools/upgrade.sh
index 6e9696202..fe8fbadca 100644
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh
@@ -1,8 +1,7 @@
# Use colors, but only if connected to a terminal, and that terminal
# supports them.
-tput=$(which tput)
-if [ -n "$tput" ]; then
+if which tput >/dev/null 2>&1; then
ncolors=$(tput colors)
fi
if [ -t 1 ] && [ -n "$ncolors" ] && [ "$ncolors" -ge 8 ]; then
generated by cgit v1.2.3-70-g09d2 (git 2.48.1) at 2025-02-03 03:09:18 +0000