1e9f55f09ddae273836ad1a69a0068b039de9fcd

Author
Andrew Vit <andrew@avit.ca>
Committer
Andrew Vit <andrew@avit.ca>
Date

Message

Add configuration placeholders to installer template

Although the zshrc template adds a PATH= string, this is overwritten by the installer script.
This allows it to be placed anywhere in the file instead of having to append at the end.

Diff

 1diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
 2index 1dfb6998c488f0d71063d14c939fa6330656e384..2ebfaf3e7b024a3fc0e2df125647ed0d93541232 100644
 3--- a/templates/zshrc.zsh-template
 4+++ b/templates/zshrc.zsh-template
 5@@ -44,4 +44,21 @@ plugins=(git)
 6 
 7 source $ZSH/oh-my-zsh.sh
 8 
 9-# Customize to your needs...
10+# User configuration
11+
12+export PATH=$HOME/bin:/usr/local/bin:$PATH
13+# export MANPATH="/usr/local/man:$MANPATH"
14+
15+# # Preferred editor for local and remote sessions
16+# if [[ -n $SSH_CONNECTION ]]; then
17+#   export EDITOR='vim'
18+# else
19+#   export EDITOR='mvim'
20+# fi
21+
22+# Compilation flags
23+# export ARCHFLAGS="-arch x86_64"
24+
25+# ssh
26+# export SSH_KEY_PATH="~/.ssh/dsa_id"
27+
28diff --git a/tools/install.sh b/tools/install.sh
29index a2bd5665a8c1338473f743c76c0152bd29e420da..9017bd30263bf4534cb40739491d7fd1aad3a18e 100755
30--- a/tools/install.sh
31+++ b/tools/install.sh
32@@ -21,7 +21,9 @@ echo "\033[0;34mUsing the Oh My Zsh template file and adding it to ~/.zshrc\033[
33 cp ~/.oh-my-zsh/templates/zshrc.zsh-template ~/.zshrc
34 
35 echo "\033[0;34mCopying your current PATH and adding it to the end of ~/.zshrc for you.\033[0m"
36-echo "export PATH=\$PATH:$PATH" >> ~/.zshrc
37+sed -i -e "/export PATH=/ c\\
38+export PATH=\"$PATH\"
39+" ~/.zshrc
40 
41 echo "\033[0;34mTime to change your default shell to zsh!\033[0m"
42 chsh -s `which zsh`
43@@ -34,5 +36,6 @@ echo "\033[0;32m"'\____/_/ /_/  /_/ /_/ /_/\__, /    /___/____/_/ /_/  '"\033[0m
44 echo "\033[0;32m"'                        /____/                       '"\033[0m"
45 
46 echo "\n\n \033[0;32m....is now installed.\033[0m"
47+echo "\n\n \033[0;32mPlease look over the ~/.zshrc file to select plugins, themes, and options.\033[0m"
48 /usr/bin/env zsh
49 source ~/.zshrc