Merge commit '238d8e65a1eb2d20db0cfd84bf647b2cbfd188f0'

mj
2 parents a7c3f03946 238d8e65a1
Showing 79 changed files Side-by-side Diff
README.markdown
lib/completion.zsh
lib/git.zsh
lib/misc.zsh
oh-my-zsh.sh
plugins/adb/_adb
plugins/apache2-macports/README.md
plugins/archlinux/README.md
plugins/archlinux/archlinux.plugin.zsh
plugins/atom/README.md
plugins/aws/aws.plugin.zsh
plugins/bgnotify/bgnotify.plugin.zsh
plugins/boot2docker/README.md
plugins/boot2docker/_boot2docker
plugins/brew/_brew
plugins/brew/brew.plugin.zsh
plugins/bundler/README.md
plugins/bundler/bundler.plugin.zsh
plugins/cakephp3/cakephp3.plugin.zsh
plugins/coffee/README.md
@@ -32,10 +32,12 @@ sed -i -e &quot;/export PATH=/ c\\
 export PATH=\"$PATH\"
 " ~/.zshrc
  
-if [ "$SHELL" != "$(which zsh)" ]; then
+TEST_CURRENT_SHELL=$(expr "$SHELL" : '.*/\(.*\)')
+if [ "$TEST_CURRENT_SHELL" != "zsh" ]; then
     echo "\033[0;34mTime to change your default shell to zsh!\033[0m"
-    chsh -s `which zsh`
+    chsh -s $(grep /zsh$ /etc/shells | tail -1)
 fi
+unset TEST_CURRENT_SHELL
  
 echo "\033[0;32m"'         __                                     __   '"\033[0m"
 echo "\033[0;32m"'  ____  / /_     ____ ___  __  __   ____  _____/ /_  '"\033[0m"
...	...	@@ -32,10 +32,12 @@ sed -i -e "/export PATH=/ c\\
32	32	export PATH=\"$PATH\"
33	33	" ~/.zshrc
34	34
35		-if [ "$SHELL" != "$(which zsh)" ]; then
	35	+TEST_CURRENT_SHELL=$(expr "$SHELL" : './\(.\)')
	36	+if [ "$TEST_CURRENT_SHELL" != "zsh" ]; then
36	37	echo "\033[0;34mTime to change your default shell to zsh!\033[0m"
37		- chsh -s `which zsh`
	38	+ chsh -s $(grep /zsh$ /etc/shells \| tail -1)
38	39	fi
	40	+unset TEST_CURRENT_SHELL
39	41
40	42	echo "\033[0;32m"' __ __ '"\033[0m"
41	43	echo "\033[0;32m"' ____ / /_ ____ ___ __ __ ____ _____/ /_ '"\033[0m"