From cf4c298a8119896ab9185554c8857b1298cbde2b Mon Sep 17 00:00:00 2001
From: Luk Lu <luk.lu@faronear.org>
Date: Fri, 30 Sep 2022 20:21:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=88=E8=87=AA=E5=8A=A8=E5=B0=9D=E8=AF=95?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E8=B7=AF=E5=BE=84=EF=BC=8C=E4=B8=8D=E8=AF=A2?=
 =?UTF-8?q?=E9=97=AE=E7=94=A8=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 git-pull-all.bat | 25 ++++++++++++-------------
 git-pull-all.sh  | 27 +++++++++++++--------------
 git-push-all.bat | 25 ++++++++++++-------------
 git-push-all.sh  | 27 +++++++++++++--------------
 4 files changed, 50 insertions(+), 54 deletions(-)

diff --git a/git-pull-all.bat b/git-pull-all.bat
index 192b80e..4958ee5 100644
--- a/git-pull-all.bat
+++ b/git-pull-all.bat
@@ -1,17 +1,11 @@
 @echo off 
 
-@REM 首先清楚可能残留的变量
+@REM 首先清除可能残留的变量
 set FONPATH=
 
 @ if not "" == "%1" (
   set FONPATH=%1
 ) else (
-  echo === Enter [faronear root path] or leave blank for default to one of [D:\faronear], [C:\faronear], [%HOMEDRIVE%%HOMEPATH%\faronear], [.]
-  set /p FONPATH=">>> "
-  echo;
-)
-
-@ if "" == "%FONPATH%" (
   if exist D:\faronear (
     set FONPATH=D:\faronear
   ) else (if exist C:\faronear (
@@ -19,13 +13,18 @@ set FONPATH=
   ) else (if exist %HOMEDRIVE%%HOMEPATH%\faronear (
     set FONPATH=%HOMEDRIVE%%HOMEPATH%\faronear
   ) else (
-    set FONPATH=.
+      echo === Enter [faronear root path] or leave blank for default to one of [.]
+      set /p FONPATH=">>> "
+      echo;
+      if "" == "%FONPATH%" (
+        set FONPATH=.
+      )
   )))
-) else (
-  if not exist "%FONPATH%" (
-    echo *** [%FONPATH%] not exist! Exit now. ***
-    @ GOTO END
-  )
+)
+
+if not exist "%FONPATH%" (
+  echo *** [%FONPATH%] not exist! Exit now. ***
+  @ GOTO END
 )
 
 pushd %FONPATH%
diff --git a/git-pull-all.sh b/git-pull-all.sh
index 981fd8a..73d0ff5 100755
--- a/git-pull-all.sh
+++ b/git-pull-all.sh
@@ -4,13 +4,6 @@ if [ $1 ]
 then
   FONPATH=$1
 else
-  echo "=== Enter [faronear root path] or leave blank for default to one of [/faronear], [~/faronear], [.]"
-  read -p ">>> " FONPATH
-  echo ""
-fi
-
-if [ ! $FONPATH ]
-then
   if [ -d /faronear ]
   then 
     FONPATH=/faronear
@@ -19,15 +12,21 @@ then
     then
       FONPATH=~/faronear
     else
-      FONPATH=.
+      echo "=== Enter [faronear root path] or leave blank for default to [.]"
+      read -p ">>> " FONPATH
+      echo ""
+      if [ ! $FONPATH ]
+      then
+        FONPATH=.
+      fi
     fi
   fi
-else
-  if [ ! -d $FONPATH ]
-  then 
-    echo "*** [$FONPATH] not exist! Exit now. ***"
-    exit
-  fi
+fi
+
+if [ ! -d $FONPATH ]
+then 
+  echo "*** [$FONPATH] not exist! Exit now. ***"
+  exit
 fi
 
 pushd $FONPATH
diff --git a/git-push-all.bat b/git-push-all.bat
index bd96583..eaf86c3 100644
--- a/git-push-all.bat
+++ b/git-push-all.bat
@@ -1,17 +1,11 @@
 @echo off 
 
-@REM 首先清楚可能残留的变量
+@REM 首先清除可能残留的变量
 set FONPATH=
 
 @ if not "" == "%1" (
   set FONPATH=%1
 ) else (
-  echo === Enter [faronear root path] or leave blank for default to one of [D:\faronear], [C:\faronear], [%HOMEDRIVE%%HOMEPATH%\faronear], [.]
-  set /p FONPATH=">>> "
-  echo;
-)
-
-@ if "" == "%FONPATH%" (
   if exist D:\faronear (
     set FONPATH=D:\faronear
   ) else (if exist C:\faronear (
@@ -19,13 +13,18 @@ set FONPATH=
   ) else (if exist %HOMEDRIVE%%HOMEPATH%\faronear (
     set FONPATH=%HOMEDRIVE%%HOMEPATH%\faronear
   ) else (
-    set FONPATH=.
+      echo === Enter [faronear root path] or leave blank for default to one of [.]
+      set /p FONPATH=">>> "
+      echo;
+      if "" == "%FONPATH%" (
+        set FONPATH=.
+      )
   )))
-) else (
-  if not exist "%FONPATH%" (
-    echo *** [%FONPATH%] not exist! Exit now. ***
-    @ GOTO END
-  )
+)
+
+if not exist "%FONPATH%" (
+  echo *** [%FONPATH%] not exist! Exit now. ***
+  @ GOTO END
 )
 
 pushd %FONPATH%
diff --git a/git-push-all.sh b/git-push-all.sh
index a90412d..b72b6b6 100755
--- a/git-push-all.sh
+++ b/git-push-all.sh
@@ -4,13 +4,6 @@ if [ $1 ]
 then
   FONPATH=$1
 else
-  echo "=== Enter [faronear root path] or leave blank for default to one of [/faronear], [~/faronear], [.]"
-  read -p ">>> " FONPATH
-  echo ""
-fi
-
-if [ ! $FONPATH ]
-then
   if [ -d /faronear ]
   then 
     FONPATH=/faronear
@@ -19,15 +12,21 @@ then
     then
       FONPATH=~/faronear
     else
-      FONPATH=.
+      echo "=== Enter [faronear root path] or leave blank for default to [.]"
+      read -p ">>> " FONPATH
+      echo ""
+      if [ ! $FONPATH ]
+      then
+        FONPATH=.
+      fi
     fi
   fi
-else
-  if [ ! -d $FONPATH ]
-  then 
-    echo "*** [$FONPATH] not exist! Exit now. ***"
-    exit
-  fi
+fi
+
+if [ ! -d $FONPATH ]
+then 
+  echo "*** [$FONPATH] not exist! Exit now. ***"
+  exit
 fi
 
 pushd $FONPATH