Merged upstream commits

tools/check_for_upgrade.sh

@@ -23,7 +23,7 @@ then
   fi
 
   epoch_diff=$(($(_current_epoch) - $LAST_EPOCH))
-  if [ $epoch_diff -gt 6 ]
+  if [ $epoch_diff -gt 13 ]
   then
     if [ "$DISABLE_UPDATE_PROMPT" = "true" ]
     then
@@ -32,9 +32,10 @@ then
       echo "[Oh My Zsh] Would you like to check for updates?"
       echo "Type Y to update oh-my-zsh: \c"
       read line
-      if [ "$line" = Y ] || [ "$line" = y ]
-      then
+      if [ "$line" = Y ] || [ "$line" = y ]; then
         _upgrade_zsh
+      else
+        _update_zsh_update
       fi
     fi
   fi

tools/install.sh

@@ -5,7 +5,12 @@ then
 fi
 
 echo "\033[0;34mCloning Oh My Zsh...\033[0m"
-/usr/bin/env git clone https://github.com/DavidJRobertson/oh-my-zsh.git ~/.oh-my-zsh
+
+hash git >/dev/null && /usr/bin/env git clone https://github.com/DavidJRobertson/oh-my-zsh.git ~/.oh-my-zsh || {
+  echo "git not installed"
+  exit
+}
+
 
 echo "\033[0;34mLooking for an existing zsh config...\033[0m"
 if [ -f ~/.zshrc ] || [ -h ~/.zshrc ]