diff --git a/git-pull-all.sh b/git-pull-all.sh
index 73d0ff5..9c7373b 100755
--- a/git-pull-all.sh
+++ b/git-pull-all.sh
@@ -3,23 +3,19 @@
 if [ $1 ]
 then
   FONPATH=$1
+elif [ -d /faronear ]
+then 
+  FONPATH=/faronear
+elif [ -d ~/faronear ]
+then
+  FONPATH=~/faronear
 else
-  if [ -d /faronear ]
-  then 
-    FONPATH=/faronear
-  else
-    if [ -d ~/faronear ]
-    then
-      FONPATH=~/faronear
-    else
-      echo "=== Enter [faronear root path] or leave blank for default to [.]"
-      read -p ">>> " FONPATH
-      echo ""
-      if [ ! $FONPATH ]
-      then
-        FONPATH=.
-      fi
-    fi
+  echo "=== Enter [faronear root path] or leave blank for default to [.]"
+  read -p ">>> " FONPATH
+  echo ""
+  if [ ! $FONPATH ]
+  then
+    FONPATH=.
   fi
 fi
 
diff --git a/git-push-all.sh b/git-push-all.sh
index b72b6b6..a174693 100755
--- a/git-push-all.sh
+++ b/git-push-all.sh
@@ -3,23 +3,19 @@
 if [ $1 ]
 then
   FONPATH=$1
+elif [ -d /faronear ]
+then 
+  FONPATH=/faronear
+elif [ -d ~/faronear ]
+then
+  FONPATH=~/faronear
 else
-  if [ -d /faronear ]
-  then 
-    FONPATH=/faronear
-  else
-    if [ -d ~/faronear ]
-    then
-      FONPATH=~/faronear
-    else
-      echo "=== Enter [faronear root path] or leave blank for default to [.]"
-      read -p ">>> " FONPATH
-      echo ""
-      if [ ! $FONPATH ]
-      then
-        FONPATH=.
-      fi
-    fi
+  echo "=== Enter [faronear root path] or leave blank for default to [.]"
+  read -p ">>> " FONPATH
+  echo ""
+  if [ ! $FONPATH ]
+  then
+    FONPATH=.
   fi
 fi
 
diff --git a/git-rename-branch.sh b/git-rename-branch.sh
index 512f522..f2005df 100755
--- a/git-rename-branch.sh
+++ b/git-rename-branch.sh
@@ -11,13 +11,11 @@ else
     if [ -d /faronear ]
     then 
       FONPATH=/faronear
+    elif [ -d ~/faronear ]
+    then
+      FONPATH=~/faronear
     else
-      if [ -d ~/faronear ]
-      then
-        FONPATH=~/faronear
-      else
-        FONPATH=.
-      fi
+      FONPATH=.
     fi
   fi
 fi
diff --git a/nixhome/.bashrc b/nixhome/.bashrc
index 3a1cbd8..ca50465 100644
--- a/nixhome/.bashrc
+++ b/nixhome/.bashrc
@@ -102,8 +102,15 @@ export USERPROFILE=$HOME
 if [ -d /Users/luk.lu/faronear/fon/sysconfig ]
 then
   export PATH=/Users/luk.lu/faronear/fon/sysconfig:$PATH
-else [ -d /faronear/fon/sysconfig ]
+elif [ -d /Users/luk.lu/faronear/fon/sysconfig.git ]
+then 
+  export PATH=/Users/luk.lu/faronear/fon/sysconfig.git:$PATH
+elif [ -d /faronear/fon/sysconfig ]
+then
   export PATH=/faronear/fon/sysconfig:$PATH
+elif [ -d /faronear/fon/sysconfig.git ]
+then 
+  export PATH=/faronear/fon/sysconfig.git:$PATH
 fi
 
 if [ -f ~/.bashrc_custom ]
diff --git a/npm-boot-all.sh b/npm-boot-all.sh
index 38b044e..1a60824 100755
--- a/npm-boot-all.sh
+++ b/npm-boot-all.sh
@@ -14,20 +14,16 @@ then
   if [ -d /faronear ]
   then 
     FONPATH=/faronear
+  elif [ -d ~/faronear ]
+  then
+    FONPATH=~/faronear
   else
-    if [ -d ~/faronear ]
-    then
-      FONPATH=~/faronear
-    else
-      FONPATH=.
-    fi
-  fi
-else
-  if [ ! -d $FONPATH ]
-  then 
-    echo "*** [$FONPATH] not exist! Exit now. ***"
-    exit
+    FONPATH=.
   fi
+elif [ ! -d $FONPATH ]
+then 
+  echo "*** [$FONPATH] not exist! Exit now. ***"
+  exit
 fi
 
 pushd $FONPATH