From 4fec0a46e73479cf3b9e7f953750af5ed5df87ac Mon Sep 17 00:00:00 2001 From: Marc Cornellà Date: Tue, 17 Apr 2018 22:14:23 +0200 Subject: [installer] use `command -v` to check for git Quick fix to the script not finding git due to hash. Solves #6697. --- tools/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools/install.sh') diff --git a/tools/install.sh b/tools/install.sh index 187c828f5..840a0d7d8 100755 --- a/tools/install.sh +++ b/tools/install.sh @@ -49,7 +49,7 @@ main() { umask g-w,o-w printf "${BLUE}Cloning Oh My Zsh...${NORMAL}\n" - hash git >/dev/null 2>&1 || { + command -v git >/dev/null 2>&1 || { echo "Error: git is not installed" exit 1 } -- cgit v1.2.3-70-g09d2 From c4981bae0a91ce6d4b0717558342584cc6491199 Mon Sep 17 00:00:00 2001 From: Marc Cornellà Date: Sat, 5 May 2018 21:27:48 +0200 Subject: installer: check if zsh in path instead of /etc/shells Fixes #4955 Closes #5931 Closes #6398 Co-authored-by: Void Co-authored-by: Kaleb Elwert --- tools/install.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'tools/install.sh') diff --git a/tools/install.sh b/tools/install.sh index 840a0d7d8..1a0a8e6db 100755 --- a/tools/install.sh +++ b/tools/install.sh @@ -24,12 +24,10 @@ main() { # 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 + if command -v zsh >/dev/null 2>&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 -- cgit v1.2.3-70-g09d2 From 8f0ff4bb63a8fd26741128a851c224af323eb772 Mon Sep 17 00:00:00 2001 From: ningwei1993 Date: Mon, 7 May 2018 06:39:28 +0800 Subject: fix bug for check zsh (#6798) --- tools/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools/install.sh') diff --git a/tools/install.sh b/tools/install.sh index 1a0a8e6db..ad47df785 100755 --- a/tools/install.sh +++ b/tools/install.sh @@ -24,7 +24,7 @@ main() { # which may fail on systems lacking tput or terminfo set -e - if command -v zsh >/dev/null 2>&1; then + if ! command -v zsh >/dev/null 2>&1; then printf "${YELLOW}Zsh is not installed!${NORMAL} Please install zsh first!\n" exit fi -- cgit v1.2.3-70-g09d2 From fec0089cddf4eb6677d90561079f7a6cb0971197 Mon Sep 17 00:00:00 2001 From: Dan Wallis Date: Wed, 13 Jun 2018 01:02:48 +0100 Subject: Quote $ZSH where necessary in install script (#6587) Quote $ZSH where necessary in install script --- tools/install.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tools/install.sh') diff --git a/tools/install.sh b/tools/install.sh index ad47df785..b815a9c81 100755 --- a/tools/install.sh +++ b/tools/install.sh @@ -59,7 +59,7 @@ main() { exit 1 fi fi - env git clone --depth=1 https://github.com/robbyrussell/oh-my-zsh.git $ZSH || { + 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 } @@ -72,9 +72,9 @@ main() { fi printf "${BLUE}Using the Oh My Zsh template file and adding it to ~/.zshrc${NORMAL}\n" - cp $ZSH/templates/zshrc.zsh-template ~/.zshrc + cp "$ZSH"/templates/zshrc.zsh-template ~/.zshrc sed "/^export ZSH=/ c\\ - export ZSH=$ZSH + export ZSH=\"$ZSH\" " ~/.zshrc > ~/.zshrc-omztemp mv -f ~/.zshrc-omztemp ~/.zshrc -- cgit v1.2.3-70-g09d2 From 8f95637e6772a1156a29d9c6a9c21ea8d7316a12 Mon Sep 17 00:00:00 2001 From: Joel Kuzmarski Date: Sun, 1 Jul 2018 11:39:30 -0500 Subject: Login shell after install (#5314) Otherwise these files are not sourced: 1. /etc/zprofile 2. ~/.zprofile 3. /etc/zlogin 4. ~/.zlogin 5. ~/.zlogout 6. /etc/zlogout --- tools/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools/install.sh') diff --git a/tools/install.sh b/tools/install.sh index b815a9c81..0cc020053 100755 --- a/tools/install.sh +++ b/tools/install.sh @@ -108,7 +108,7 @@ main() { echo 'p.p.s. Get stickers and t-shirts at https://shop.planetargon.com.' echo '' printf "${NORMAL}" - env zsh + env zsh -l } main -- cgit v1.2.3-70-g09d2 From 026e4e499e6b01ebe4b6d9748c6e2eb182ad1359 Mon Sep 17 00:00:00 2001 From: Jackson Delahunt Date: Wed, 16 Jan 2019 05:01:34 +1100 Subject: installer: make TEST_CURRENT_SHELL use basename (#7514) Fixes #7492 --- tools/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools/install.sh') diff --git a/tools/install.sh b/tools/install.sh index 0cc020053..2fb87cdaf 100755 --- a/tools/install.sh +++ b/tools/install.sh @@ -79,7 +79,7 @@ main() { mv -f ~/.zshrc-omztemp ~/.zshrc # If this user's login shell is not already "zsh", attempt to switch. - TEST_CURRENT_SHELL=$(expr "$SHELL" : '.*/\(.*\)') + TEST_CURRENT_SHELL=$(basename "$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 -- cgit v1.2.3-70-g09d2 From f319aa845dfa6b202e31dacf49ec8c2b2d5d17c2 Mon Sep 17 00:00:00 2001 From: Robby Russell Date: Mon, 25 Feb 2019 19:22:07 -0600 Subject: Updating Oh My Zsh shop URLs (#7619) * Updating Oh My Zsh shop URLs Linking directly to the Oh My Zsh inventory vs the top-level store with non-OMZ items. * Updating link to Oh My Zsh products in the install script * Updating link to Oh My Zsh shop products in the upgrade script * Getting rid of 't-' in shirts for now --- README.md | 2 +- tools/install.sh | 2 +- tools/upgrade.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'tools/install.sh') diff --git a/README.md b/README.md index b3651a99c..d6c77a147 100644 --- a/README.md +++ b/README.md @@ -238,7 +238,7 @@ We're on the social media. ## Merchandise -We have [stickers](https://shop.planetargon.com/products/ohmyzsh-stickers-set-of-3-stickers) and [shirts](https://shop.planetargon.com/products/ohmyzsh-t-shirts) for you to show off your love of Oh My Zsh. Again, this will help you become the talk of the town! +We have [stickers, shirts, and coffee mugs available](https://shop.planetargon.com/collections/oh-my-zsh?utm_source=github) for you to show off your love of Oh My Zsh. Again, you will become the talk of the town! ## License diff --git a/tools/install.sh b/tools/install.sh index 2fb87cdaf..e2b33f640 100755 --- a/tools/install.sh +++ b/tools/install.sh @@ -105,7 +105,7 @@ main() { echo '' echo 'p.s. Follow us at https://twitter.com/ohmyzsh.' echo '' - echo 'p.p.s. Get stickers and t-shirts at https://shop.planetargon.com.' + echo 'p.p.s. Get stickers, shirts, and coffee mugs at https://shop.planetargon.com/collections/oh-my-zsh.' echo '' printf "${NORMAL}" env zsh -l diff --git a/tools/upgrade.sh b/tools/upgrade.sh index 25b2de27a..d234c7f88 100644 --- a/tools/upgrade.sh +++ b/tools/upgrade.sh @@ -33,7 +33,7 @@ then printf '%s\n' ' /____/ ' printf "${BLUE}%s\n" "Hooray! Oh My Zsh has been updated and/or is at the current version." printf "${BLUE}${BOLD}%s${NORMAL}\n" "To keep up on the latest news and updates, follow us on twitter: https://twitter.com/ohmyzsh" - printf "${BLUE}${BOLD}%s${NORMAL}\n" "Get your Oh My Zsh swag at: https://shop.planetargon.com/" + printf "${BLUE}${BOLD}%s${NORMAL}\n" "Get your Oh My Zsh swag at: https://shop.planetargon.com/collections/oh-my-zsh" else printf "${RED}%s${NORMAL}\n" 'There was an error updating. Try again later?' fi -- cgit v1.2.3-70-g09d2 From 9b2410fbcfa21d6115219fe626a6f422b578d3ac Mon Sep 17 00:00:00 2001 From: Guillermo Azurdia Date: Thu, 18 Apr 2019 16:08:07 -0500 Subject: Remove dots from installer URLs (#7780) --- tools/install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tools/install.sh') diff --git a/tools/install.sh b/tools/install.sh index e2b33f640..2e5e8fd43 100755 --- a/tools/install.sh +++ b/tools/install.sh @@ -103,9 +103,9 @@ main() { 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 'p.s. Follow us at https://twitter.com/ohmyzsh' echo '' - echo 'p.p.s. Get stickers, shirts, and coffee mugs at https://shop.planetargon.com/collections/oh-my-zsh.' + echo 'p.p.s. Get stickers, shirts, and coffee mugs at https://shop.planetargon.com/collections/oh-my-zsh' echo '' printf "${NORMAL}" env zsh -l -- cgit v1.2.3-70-g09d2