dac2a6e27a23071226495bfee54b390135cb20b6

Author
Fredrik Fornwall <fredrik@fornwall.net>
Committer
Fredrik Fornwall <fredrik@fornwall.net>
Date

Message

Replace /usr/bin/env with env

Some environments (such as Android) does not have /usr/bin.

Diff

 1diff --git a/lib/functions.zsh b/lib/functions.zsh
 2index fda84a953907f770ab30c974ead543a72874e4f7..17f5f9cbf246ff0e6c58abfff6dff3ea227c99d8 100644
 3--- a/lib/functions.zsh
 4+++ b/lib/functions.zsh
 5@@ -3,11 +3,11 @@ function zsh_stats() {
 6 }
 7 
 8 function uninstall_oh_my_zsh() {
 9-  /usr/bin/env ZSH=$ZSH /bin/sh $ZSH/tools/uninstall.sh
10+  env ZSH=$ZSH /bin/sh $ZSH/tools/uninstall.sh
11 }
12 
13 function upgrade_oh_my_zsh() {
14-  /usr/bin/env ZSH=$ZSH /bin/sh $ZSH/tools/upgrade.sh
15+  env ZSH=$ZSH /bin/sh $ZSH/tools/upgrade.sh
16 }
17 
18 function take() {
19diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
20index c217b91bbb57493b91263dc196e75caaec81c5a5..a90b3e98a7da76b84a0da46c633328b03ffdd242 100644
21--- a/oh-my-zsh.sh
22+++ b/oh-my-zsh.sh
23@@ -1,6 +1,6 @@
24 # Check for updates on initial load...
25 if [ "$DISABLE_AUTO_UPDATE" != "true" ]; then
26-  /usr/bin/env ZSH=$ZSH DISABLE_UPDATE_PROMPT=$DISABLE_UPDATE_PROMPT zsh -f $ZSH/tools/check_for_upgrade.sh
27+  env ZSH=$ZSH DISABLE_UPDATE_PROMPT=$DISABLE_UPDATE_PROMPT zsh -f $ZSH/tools/check_for_upgrade.sh
28 fi
29 
30 # Initializes Oh My Zsh
31diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
32index 8b8ecae035fa0f47193b57e64fff82eff01af1ea..35e074297e865c8adfb82c360936a8e886c9a11b 100644
33--- a/tools/check_for_upgrade.sh
34+++ b/tools/check_for_upgrade.sh
35@@ -9,7 +9,7 @@ function _update_zsh_update() {
36 }
37 
38 function _upgrade_zsh() {
39-  /usr/bin/env ZSH=$ZSH /bin/sh $ZSH/tools/upgrade.sh
40+  env ZSH=$ZSH /bin/sh $ZSH/tools/upgrade.sh
41   # update the zsh file
42   _update_zsh_update
43 }
44diff --git a/tools/install.sh b/tools/install.sh
45index fc7ad70cf0b4521889d30d7622e6dd1bf8f314ef..7efab10b9d4e0d0d5eca318ce95c65d3eb978090 100755
46--- a/tools/install.sh
47+++ b/tools/install.sh
48@@ -10,7 +10,7 @@ if [ -d "$ZSH" ]; then
49 fi
50 
51 echo "\033[0;34mCloning Oh My Zsh...\033[0m"
52-hash git >/dev/null 2>&1 && /usr/bin/env git clone https://github.com/robbyrussell/oh-my-zsh.git $ZSH || {
53+hash git >/dev/null 2>&1 && env git clone https://github.com/robbyrussell/oh-my-zsh.git $ZSH || {
54   echo "git not installed"
55   exit
56 }
57@@ -43,5 +43,5 @@ echo "\033[0;32m"'\____/_/ /_/  /_/ /_/ /_/\__, /    /___/____/_/ /_/  '"\033[0m
58 echo "\033[0;32m"'                        /____/                       ....is now installed!'"\033[0m"
59 echo "\n\n \033[0;32mPlease look over the ~/.zshrc file to select plugins, themes, and options.\033[0m"
60 echo "\n\n \033[0;32mp.s. Follow us at http://twitter.com/ohmyzsh.\033[0m"
61-/usr/bin/env zsh
62+env zsh
63 . ~/.zshrc