From 45cd2df31fc6d1250cbcad2ee0d562c67a163523 Mon Sep 17 00:00:00 2001 From: LE Manh Cuong Date: Fri, 23 Oct 2015 09:03:24 +0700 Subject: [PATCH 1/3] Update uninstall.sh - Need dot `.` for POSIX compliant instead of `source` - Use modern syntax for command substitution - Fix missing double quotes --- tools/uninstall.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/uninstall.sh b/tools/uninstall.sh index 9ad1b64a6..147535a11 100644 --- a/tools/uninstall.sh +++ b/tools/uninstall.sh @@ -18,14 +18,14 @@ then if [ -f ~/.zshrc ] || [ -h ~/.zshrc ] then - ZSHRC_SAVE=".zshrc.omz-uninstalled-`date +%Y%m%d%H%M%S`"; + 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; + . ~/.zshrc; else if hash chsh >/dev/null 2>&1 then From 53a63355beb1143aa5f6759a3dfdb1d7657475fe Mon Sep 17 00:00:00 2001 From: LE Manh Cuong Date: Fri, 23 Oct 2015 14:15:03 +0700 Subject: [PATCH 2/3] Change coding style --- tools/uninstall.sh | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/tools/uninstall.sh b/tools/uninstall.sh index 147535a11..132e63760 100644 --- a/tools/uninstall.sh +++ b/tools/uninstall.sh @@ -1,23 +1,19 @@ read -r -p "Are you sure you want to remove Oh My Zsh? [y/N] " confirmation -if [ "$confirmation" != y ] && [ "$confirmation" != Y ] -then +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 + 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}"; @@ -27,8 +23,7 @@ then . ~/.zshrc; 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 From c25002a13fe5decb1d2c1501269efec97f7413c9 Mon Sep 17 00:00:00 2001 From: LE Manh Cuong Date: Wed, 4 Nov 2015 20:36:53 +0700 Subject: [PATCH 3/3] Removing `source` command --- tools/uninstall.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/uninstall.sh b/tools/uninstall.sh index 132e63760..bf2244be8 100644 --- a/tools/uninstall.sh +++ b/tools/uninstall.sh @@ -21,7 +21,7 @@ if [ -f ~/.zshrc.pre-oh-my-zsh ] || [ -h ~/.zshrc.pre-oh-my-zsh ]; then mv ~/.zshrc.pre-oh-my-zsh ~/.zshrc; - . ~/.zshrc; + echo "Your original zsh config was restored. Please restart your session." else if hash chsh >/dev/null 2>&1; then echo "Switching back to bash"