[parser] Fixed merge conflict

2018-05-04 12:33:10 -07:00 · 2018-05-04 12:33:10 -07:00 · b55b55ce7b
commit b55b55ce7b
parent 45fc52df36 d69fe45c58
3 changed files with 13 additions and 5 deletions
--- a/src/parser
+++ b/src/parser
@ -7,9 +7,9 @@
 GIT_DIR="./"

 #Recursive argument parser
-while [[ -z "${1}" ]]; do
-    case ${1} in
-        --help)
+while true; do
+	case ${1} in
+		--help)
            shift
            HELP="${1}"
            [[ -z "${HELP}" ]] && HELP=general
@ -25,7 +25,10 @@ while [[ -z "${1}" ]]; do
        --git-dir)    
            shift
            GIT_DIR="${1}"
-            shift
+        ;;
+
+        *)
+            break
        ;;

    esac