Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
adam.huang
Ohmyzsh
Commits
dac2a6e2
Commit
dac2a6e2
authored
Aug 20, 2014
by
Fredrik Fornwall
Browse files
Replace /usr/bin/env with env
Some environments (such as Android) does not have /usr/bin.
parent
1b7a3ea9
Changes
4
Hide whitespace changes
Inline
Side-by-side
lib/functions.zsh
View file @
dac2a6e2
...
@@ -3,11 +3,11 @@ function zsh_stats() {
...
@@ -3,11 +3,11 @@ function zsh_stats() {
}
}
function
uninstall_oh_my_zsh
()
{
function
uninstall_oh_my_zsh
()
{
/usr/bin/
env
ZSH
=
$ZSH
/bin/sh
$ZSH
/tools/uninstall.sh
env
ZSH
=
$ZSH
/bin/sh
$ZSH
/tools/uninstall.sh
}
}
function
upgrade_oh_my_zsh
()
{
function
upgrade_oh_my_zsh
()
{
/usr/bin/
env
ZSH
=
$ZSH
/bin/sh
$ZSH
/tools/upgrade.sh
env
ZSH
=
$ZSH
/bin/sh
$ZSH
/tools/upgrade.sh
}
}
function
take
()
{
function
take
()
{
...
...
oh-my-zsh.sh
View file @
dac2a6e2
# Check for updates on initial load...
# Check for updates on initial load...
if
[
"
$DISABLE_AUTO_UPDATE
"
!=
"true"
]
;
then
if
[
"
$DISABLE_AUTO_UPDATE
"
!=
"true"
]
;
then
/usr/bin/
env
ZSH
=
$ZSH
DISABLE_UPDATE_PROMPT
=
$DISABLE_UPDATE_PROMPT
zsh
-f
$ZSH
/tools/check_for_upgrade.sh
env
ZSH
=
$ZSH
DISABLE_UPDATE_PROMPT
=
$DISABLE_UPDATE_PROMPT
zsh
-f
$ZSH
/tools/check_for_upgrade.sh
fi
fi
# Initializes Oh My Zsh
# Initializes Oh My Zsh
...
...
tools/check_for_upgrade.sh
View file @
dac2a6e2
...
@@ -9,7 +9,7 @@ function _update_zsh_update() {
...
@@ -9,7 +9,7 @@ function _update_zsh_update() {
}
}
function
_upgrade_zsh
()
{
function
_upgrade_zsh
()
{
/usr/bin/
env
ZSH
=
$ZSH
/bin/sh
$ZSH
/tools/upgrade.sh
env
ZSH
=
$ZSH
/bin/sh
$ZSH
/tools/upgrade.sh
# update the zsh file
# update the zsh file
_update_zsh_update
_update_zsh_update
}
}
...
...
tools/install.sh
View file @
dac2a6e2
...
@@ -10,7 +10,7 @@ if [ -d "$ZSH" ]; then
...
@@ -10,7 +10,7 @@ if [ -d "$ZSH" ]; then
fi
fi
echo
"
\0
33[0;34mCloning Oh My Zsh...
\0
33[0m"
echo
"
\0
33[0;34mCloning Oh My Zsh...
\0
33[0m"
hash
git
>
/dev/null 2>&1
&&
/usr/bin/
env git clone https://github.com/robbyrussell/oh-my-zsh.git
$ZSH
||
{
hash
git
>
/dev/null 2>&1
&&
env
git clone https://github.com/robbyrussell/oh-my-zsh.git
$ZSH
||
{
echo
"git not installed"
echo
"git not installed"
exit
exit
}
}
...
@@ -43,5 +43,5 @@ echo "\033[0;32m"'\____/_/ /_/ /_/ /_/ /_/\__, / /___/____/_/ /_/ '"\033[0m
...
@@ -43,5 +43,5 @@ echo "\033[0;32m"'\____/_/ /_/ /_/ /_/ /_/\__, / /___/____/_/ /_/ '"\033[0m
echo
"
\0
33[0;32m"
' /____/ ....is now installed!'
"
\0
33[0m"
echo
"
\0
33[0;32m"
' /____/ ....is now installed!'
"
\0
33[0m"
echo
"
\n\n
\0
33[0;32mPlease look over the ~/.zshrc file to select plugins, themes, and options.
\0
33[0m"
echo
"
\n\n
\0
33[0;32mPlease look over the ~/.zshrc file to select plugins, themes, and options.
\0
33[0m"
echo
"
\n\n
\0
33[0;32mp.s. Follow us at http://twitter.com/ohmyzsh.
\0
33[0m"
echo
"
\n\n
\0
33[0;32mp.s. Follow us at http://twitter.com/ohmyzsh.
\0
33[0m"
/usr/bin/
env zsh
env
zsh
.
~/.zshrc
.
~/.zshrc
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment