Commit aa203e431a3b4d8ce3fa7732a5a441680839bf30

Authored by mj
1 parent b6a161bbf8
Exists in master and in 2 other branches 02-merge, dev

TEST

Showing 2 changed files with 7 additions and 6 deletions Side-by-side Diff

... ... @@ -28,9 +28,9 @@ plugins=(command-not-found common-aliases debian dirhistory git history history-
28 28 meteor node npm
29 29 )
30 30  
31   -if [ -f ~/.config/zsh-config/templates/bash_aliases ]; then
32   - . ~/.config/zsh-config/templates/bash_aliases
33   -fi
  31 +#if [ -f ~/.config/zsh-config/templates/bash_aliases ]; then
  32 +# . ~/.config/zsh-config/templates/bash_aliases
  33 +#fi
34 34  
35 35 # User configuration
36 36 export PATH=$HOME/bin:/usr/local/bin:$PATH
... ... @@ -87,7 +87,8 @@ export PATH=\"$PATH\"
87 87  
88 88 if [ "$SHELL" != "$(which zsh)" ]; then
89 89 echo "\033[0;34mTime to change your default shell to zsh!\033[0m"
90   - echo "chsh -s $(which zsh)"
  90 + # echo "chsh -s $(which zsh)"
  91 + chsh -s /bin/zsh
91 92 fi
92 93  
93 94 echo "\033[0;32m"' __ __ '"\033[0m"
... ... @@ -99,5 +100,5 @@ echo "\033[0;32m"' /____/ ....is no
99 100 echo "\n\n \033[0;32mPlease look over the ~/.zshrc file to select plugins, themes, and options.\033[0m"
100 101 echo "\n\n \033[0;32mp.s. Follow us at http://twitter.com/ohmyzsh.\033[0m"
101 102 echo "\n\n \033[0;32mp.p.s. Get stickers and t-shirts at http://shop.planetargon.com.\033[0m"
102   -#env zsh
103   -#. ~/.zshrc
  103 +env zsh
  104 +. ~/.zshrc