adphi/oh-my-zsh
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

installer: fix ordering of cygwin msys git check (#4557)

Browse Source
This commit is contained in:
Andrew Janke 2016-05-30 18:53:54 -04:00 committed by Marc Cornellà
parent 9e8f417dab
commit 483f1208a5
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/install.sh
View File

@ -53,11 +53,6 @@ main() {
echo "Error: git is not installed" echo "Error: git is not installed"
exit 1 exit 1
} }
env git clone --depth=1 https://github.com/robbyrussell/oh-my-zsh.git $ZSH || {
printf "Error: git clone of oh-my-zsh repo failed\n"
exit 1
}
# The Windows (MSYS) Git is not compatible with normal use on cygwin # The Windows (MSYS) Git is not compatible with normal use on cygwin
if [ "$OSTYPE" = cygwin ]; then if [ "$OSTYPE" = cygwin ]; then
if git --version | grep msysgit > /dev/null; then if git --version | grep msysgit > /dev/null; then
@ -66,6 +61,11 @@ main() {
exit 1 exit 1
fi fi
fi fi
env git clone --depth=1 https://github.com/robbyrussell/oh-my-zsh.git $ZSH || {
printf "Error: git clone of oh-my-zsh repo failed\n"
exit 1
}
printf "${BLUE}Looking for an existing zsh config...${NORMAL}\n" printf "${BLUE}Looking for an existing zsh config...${NORMAL}\n"
if [ -f ~/.zshrc ] || [ -h ~/.zshrc ]; then if [ -f ~/.zshrc ] || [ -h ~/.zshrc ]; then