Merge branch 'develop'

Author: tonydeng

installer.sh

@@ -8,18 +8,37 @@ function init() {
     SCRIPT_FILES="git-ci"
     TEMPLATE_FILES="git-message-template"
 
+    USER_HOME="$(env|grep ^HOME=|cut -c 6-)"
+
     if [[ -z "$REPO_NAME" ]]; then
         REPO_NAME="git-toolkit"
     fi
 
     if [[ -z "$REPO_HOME" ]]; then
         REPO_HOME="https://github.com/tonydeng/git-toolkit.git"
     fi
-    if [[ -z "$COMMAND_PATH_PREFIX" ]]; then
-        COMMAND_PATH_PREFIX="/usr/local/bin"
+
+    COMAND_PATHS=("/usr/local/bin" "$USER_HOME/bin")
+    INSTALL_PATHS=("/usr/local/$REPO_NAME" "$USER_HOME/.$REPO_NAME")
+    PATH_NUM=0
+    for p in "${COMAND_PATHS[@]}" ; do
+        if [[ "$(echo $PATH | grep "${p}")" ]]; then
+            touch "$p/git-toolkit-temp" > /dev/null 2>&1
+            if [[ $? == 0 ]]; then
+                COMMAND_PATH_PREFIX="$p"
+                rm "$p/git-toolkit-temp" > /dev/null 2>&1
+                break;
+            fi
+        fi
+        PATH_NUM=$(($PATH_NUM+1))
+    done
+    if [[ $PATH_NUM =~ ^[0-${#COMAND_PATHS[@]-1}] ]]; then
+        INSTALL_PATH=${INSTALL_PATHS[PATH_NUM]}
     fi
-    if [[ -z "$INSTALL_PATH" ]]; then
-        INSTALL_PATH="/usr/local/$REPO_NAME"
+
+    if [[ -z "$COMMAND_PATH_PREFIX" || -z "$INSTALL_PATH" ]]; then
+        echo "$REPO_NAME Environment init failt!"
+        exit 1;
     fi
 }
 # 卸载
@@ -51,9 +70,6 @@ function uninstall() {
 # 使用帮助
 function help() {
     echo "Usage: [environment] $REPO_NAME installer.sh [install|uninstall|update]"
-    echo "Environment:"
-    echo "   COMMAND_PATH_PREFIX=$COMMAND_PATH_PREFIX"
-    echo "   INSTALL_PATH=$INSTALL_PATH"
 }
 
 # 安装 git-toolkit
@@ -79,7 +95,7 @@ function clone() {
         cd -  ||  exit 1
     else
         echo "Cloning repo from GitHub to $INSTALL_PATH"
-        git clone "$REPO_HOME" "$INSTALL_PATH"
+        git clone "$REPO_HOME" "$INSTALL_PATH" || exit 1
         chmod -R 755 "$INSTALL_PATH/$COMMAND"
         chmod -R 755 "$INSTALL_PATH/$HOOKS"
     fi