summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobby Russell <robby@planetargon.com>2013-12-02 23:49:00 -0800
committerRobby Russell <robby@planetargon.com>2013-12-02 23:49:00 -0800
commit0d352109e97be4c86bf28eca84c8a177148ae762 (patch)
tree74650054c8aa71db8f3372af702e3362bb5b996b
parentde35b551417f7cceb2fefedf8df37ac4176fa09b (diff)
parent1e9f55f09ddae273836ad1a69a0068b039de9fcd (diff)
downloadzsh-0d352109e97be4c86bf28eca84c8a177148ae762.tar.gz
zsh-0d352109e97be4c86bf28eca84c8a177148ae762.tar.bz2
zsh-0d352109e97be4c86bf28eca84c8a177148ae762.zip
Merge pull request #1087 from avit/install-template
Add configuration placeholders to installer template
-rw-r--r--templates/zshrc.zsh-template19
-rwxr-xr-xtools/install.sh5
2 files changed, 22 insertions, 2 deletions
diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index c175c5811..b2cad20e8 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -49,4 +49,21 @@ plugins=(git)
source $ZSH/oh-my-zsh.sh
-# Customize to your needs...
+# User configuration
+
+export PATH=$HOME/bin:/usr/local/bin:$PATH
+# export MANPATH="/usr/local/man:$MANPATH"
+
+# # Preferred editor for local and remote sessions
+# if [[ -n $SSH_CONNECTION ]]; then
+# export EDITOR='vim'
+# else
+# export EDITOR='mvim'
+# fi
+
+# Compilation flags
+# export ARCHFLAGS="-arch x86_64"
+
+# ssh
+# export SSH_KEY_PATH="~/.ssh/dsa_id"
+
diff --git a/tools/install.sh b/tools/install.sh
index 5af038fd9..314affe6c 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -26,7 +26,9 @@ echo "\033[0;34mUsing the Oh My Zsh template file and adding it to ~/.zshrc\033[
cp ~/.oh-my-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"
-echo "export PATH=\$PATH:$PATH" >> ~/.zshrc
+sed -i -e "/export PATH=/ c\\
+export PATH=\"$PATH\"
+" ~/.zshrc
echo "\033[0;34mTime to change your default shell to zsh!\033[0m"
chsh -s `which zsh`
@@ -39,5 +41,6 @@ echo "\033[0;32m"'\____/_/ /_/ /_/ /_/ /_/\__, / /___/____/_/ /_/ '"\033[0m
echo "\033[0;32m"' /____/ '"\033[0m"
echo "\n\n \033[0;32m....is now installed.\033[0m"
+echo "\n\n \033[0;32mPlease look over the ~/.zshrc file to select plugins, themes, and options.\033[0m"
/usr/bin/env zsh
source ~/.zshrc