From a090142f68250c147ea0808d8498f6cb147ea3ba Mon Sep 17 00:00:00 2001
From: z3rOR0ne <z3rOR0ne@protonmail.com>
Date: Fri, 9 Sep 2022 23:33:02 -0700
Subject: [PATCH] :sparkles: Finishing up bgit

---
 scripts/bgit | 68 ++++++++++++++++++++++++++++++++++++----------------
 1 file changed, 48 insertions(+), 20 deletions(-)

diff --git a/scripts/bgit b/scripts/bgit
index 15b2c015..1b7172f5 100755
--- a/scripts/bgit
+++ b/scripts/bgit
@@ -41,7 +41,7 @@ tput bold & tput setaf 7
 
 function bgit() {
     # Intro Prompt
-    echo -e "${txtblue} bgit: a handy shell script for git inits/commits${txtred}\n"
+    echo "${txtblue} bgit: a handy shell script for git inits/commits${txtred}"
 
     numrepos=$(git remote | wc -l)
     numargs="$#"
@@ -139,7 +139,7 @@ function bgit() {
                 for ((i = 0; i < numrepos; i++)) ; do
                     git push --force ${remotearray[i]} > /dev/null 2>&1;
                 done
-                echo -e "\n${txtblue} bgit script has completed! goodbye!${txtwhite}"
+                echo "${txtblue} bgit script has completed! goodbye!${txtwhite}"
                 exit 0
 
             elif [[ $change == "n" || $change == "no" ]] ; then
@@ -157,25 +157,53 @@ function bgit() {
             fi
         done
 
-    elif [[ $numrepos -eq 0 || $numargs -eq 1 && $1 == "-i" || $1 == "--init" ]] ; then
-        if [[ $numrepos -eq 0 ]] ; then
-            echo "${txtgreen} no git repository found, executing git init...${txtwhite}"
-            source $HOME/.config/bgit/bgit_init
-            b_init "$@"
-        else
-            echo "${txtred} git repository already here..."
-            source $HOME/.config/bgit/bgit_init
-            b_init "$@"
-        fi
-
-    elif [[ $numrepos -ge 1 && $numargs -eq 1 && $1 == "-r" || $1 == "--revert" ]] ; then
-            source $HOME/.config/bgit/bgit_revert
-            b_revert "$@"
-
-    elif [[ $numargs -eq 1 && $1 == "-h" || $1 == "--help" ]] ; then
-        source $HOME/.config/bgit/bgit_help
-        b_help "$@"
+    elif [[ $numrepos -eq 0 && $numargs -eq 0 ]]; then
+        echo "${txtgreen} no git repository found, executing git init...${txtwhite}"
+        source $HOME/.config/bgit/bgit_init
+        b_init "$@"
     fi
+
+    while getopts "irh" opt ; do
+        case $opt in
+            i)
+                echo "${txtgreen} no git repository found, executing git init...${txtwhite}"
+                source $HOME/.config/bgit/bgit_init
+                b_init "$@"
+                ;;
+            r)
+                source $HOME/.config/bgit/bgit_revert
+                b_revert "$@"
+                ;;
+            h)
+                source $HOME/.config/bgit/bgit_help
+                b_help "$@"
+                ;;
+            *)
+                echo "${txtred}✗ flag not recognized...${txtwhite}"
+                echo "${txtred}✗ bgit exiting...${txtwhite}"
+                exit 1
+                ;;
+        esac
+    done
+
+    # elif [[ $numrepos -eq 0 || $numargs -eq 1 && $1 == "-i" || $numargs -eq 1 && $1 == "--init" ]] ; then
+        # if [[ $numrepos -eq 0 ]] ; then
+            # echo "${txtgreen} no git repository found, executing git init...${txtwhite}"
+            # source $HOME/.config/bgit/bgit_init
+            # b_init "$@"
+        # else
+            # echo "${txtred} git repository already here..."
+            # source $HOME/.config/bgit/bgit_init
+            # b_init "$@"
+        # fi
+
+    # elif [[ $numrepos -ge 1 && $numargs -eq 1 && $1 == "-r" || $numargs -eq 1 && $1 == "--revert" ]] ; then
+            # source $HOME/.config/bgit/bgit_revert
+            # b_revert "$@"
+
+    # elif [[ $numargs -eq 1 && $1 == "-h" || $numargs -eq 1 && $1 == "--help" ]] ; then
+        # source $HOME/.config/bgit/bgit_help
+        # b_help "$@"
 }
 
 bgit "$@"