From 5bd590ceb30ca58d96ec8d5dcfc1fec71bc6ca1f Mon Sep 17 00:00:00 2001 From: Andrew Vit Date: Sat, 8 Mar 2014 13:13:52 -0800 Subject: [PATCH 1/4] Reference default install path from ZSH variable --- tools/install.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/install.sh b/tools/install.sh index b24bb4ad3..01984ea2b 100755 --- a/tools/install.sh +++ b/tools/install.sh @@ -1,16 +1,16 @@ -ZSH=`/usr/bin/env|grep 'ZSH='|cut -d '=' -f 2` -if [ -d "$ZSH" ] +if [ ! -n $ZSH ] +then + ZSH=~/.oh-my-zsh +fi + +if [ -d $ZSH ] then echo "\033[0;33mYou already have Oh My Zsh installed.\033[0m You'll need to remove $ZSH if you want to install" exit -elif [ -d ~/.oh-my-zsh ] -then - echo "\033[0;33mYou already have One Oh My Zsh Directory.\033[0m You'll need to remove ~/.oh-my-zsh if you want to clone" - exit fi echo "\033[0;34mCloning Oh My Zsh...\033[0m" -hash git >/dev/null && /usr/bin/env git clone https://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh || { +hash git >/dev/null && /usr/bin/env git clone https://github.com/robbyrussell/oh-my-zsh.git $ZSH || { echo "git not installed" exit } @@ -23,7 +23,7 @@ then fi echo "\033[0;34mUsing the Oh My Zsh template file and adding it to ~/.zshrc\033[0m" -cp ~/.oh-my-zsh/templates/zshrc.zsh-template ~/.zshrc +cp $ZSH/templates/zshrc.zsh-template ~/.zshrc echo "\033[0;34mCopying your current PATH and adding it to the end of ~/.zshrc for you.\033[0m" sed -i -e "/export PATH=/ c\\ From 2e11e2ab5adaea762b7f2eaa6c63332a9618bb3f Mon Sep 17 00:00:00 2001 From: Andrew Vit Date: Sat, 8 Mar 2014 13:15:18 -0800 Subject: [PATCH 2/4] Write install path into .zshrc --- tools/install.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/install.sh b/tools/install.sh index 01984ea2b..5c7a5b6ca 100755 --- a/tools/install.sh +++ b/tools/install.sh @@ -24,6 +24,9 @@ fi echo "\033[0;34mUsing the Oh My Zsh template file and adding it to ~/.zshrc\033[0m" cp $ZSH/templates/zshrc.zsh-template ~/.zshrc +sed -i -e "/^ZSH=/ c\\ +ZSH=$ZSH +" ~/.zshrc echo "\033[0;34mCopying your current PATH and adding it to the end of ~/.zshrc for you.\033[0m" sed -i -e "/export PATH=/ c\\ From da1fa3b06a6369a5b3337025da164eeec275db70 Mon Sep 17 00:00:00 2001 From: Andrew Vit Date: Sat, 8 Mar 2014 13:17:16 -0800 Subject: [PATCH 3/4] Abort installer on errors --- tools/install.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/install.sh b/tools/install.sh index 5c7a5b6ca..343f251ae 100755 --- a/tools/install.sh +++ b/tools/install.sh @@ -1,3 +1,5 @@ +set -e + if [ ! -n $ZSH ] then ZSH=~/.oh-my-zsh From 9f66d5b797ab73a54d944a7bd43d920a508625ea Mon Sep 17 00:00:00 2001 From: Andrew Vit Date: Mon, 23 Apr 2012 14:01:14 -0700 Subject: [PATCH 4/4] Document alternate install paths via ZSH variable Uses environment variable $ZSH to configure install location. --- README.textile | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/README.textile b/README.textile index 810569486..0fa9b30ec 100644 --- a/README.textile +++ b/README.textile @@ -20,8 +20,18 @@ h4. via `wget` @wget --no-check-certificate https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh -O - | sh@ -h3. The manual way +h4. Optional: change the install directory +The default location is `~/.oh-my-zsh` (hidden in your home directory). + +You can change the install directory with the ZSH environment variable, either +by running `export ZSH=/your/path` before installing, or setting it before the +end of the install pipeline like this: + +@curl -L https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh | ZSH=~/.dotfiles/zsh sh@ + + +h3. The manual way 1. Clone the repository @@ -35,7 +45,6 @@ h3. The manual way @cp ~/.oh-my-zsh/templates/zshrc.zsh-template ~/.zshrc@ - 4. Set zsh as your default shell: @chsh -s /bin/zsh@ @@ -46,6 +55,8 @@ h3. Problems? You _might_ need to modify your PATH in ~/.zshrc if you're not able to find some commands after switching to _Oh My Zsh_. +If you installed manually or changed the install location, check ZSH in ~/.zshrc + h2. Usage * enable the plugins you want in your @~/.zshrc@ (take a look at @plugins/@ to see what's possible)