diff --git a/git-ignore-tree.bat b/git-ignore-tree.bat index 81b4817..46f09de 100644 --- a/git-ignore-tree.bat +++ b/git-ignore-tree.bat @@ -20,7 +20,7 @@ set FONPATH3=%HOMEDRIVE%%HOMEPATH%\faronear ) else ( echo ××× none of the testing path is valid. echo; - echo === Enter [fonpath] or leave [blank] for default to '.' + echo === Enter or leave for default to '.' set /p FONPATH=">>> " echo; if "" == "%FONPATH%" ( diff --git a/git-pull-tree.bat b/git-pull-tree.bat index 4de4654..3210da5 100644 --- a/git-pull-tree.bat +++ b/git-pull-tree.bat @@ -20,7 +20,7 @@ set FONPATH3=%HOMEDRIVE%%HOMEPATH%\faronear ) else ( echo ××× none of the testing path is valid. echo; - echo === Enter [fonpath] or leave [blank] for default to '.' + echo === Enter or leave for default to '.' set /p FONPATH=">>> " echo; if "" == "%FONPATH%" ( diff --git a/git-pull-tree.sh b/git-pull-tree.sh index a411efd..ebd044b 100755 --- a/git-pull-tree.sh +++ b/git-pull-tree.sh @@ -6,7 +6,7 @@ then else echo "××× All testing path failed." echo "" - echo "=== Enter [fonpath] or leave [blank] for default to '.'" + echo "=== Enter or leave for default to '.'" read -p ">>> " FONPATH echo "" if [ ! "$FONPATH" ] @@ -17,7 +17,7 @@ fi if [ ! -d "$FONPATH" ] then - echo "××× [$FONPATH] not exist! Exit now. ***" + echo "××× <$FONPATH> not exist! Exit now. ***" exit else echo "√√√ FONPATH = $FONPATH" diff --git a/git-push-tree.bat b/git-push-tree.bat index 48259e6..ce5604b 100644 --- a/git-push-tree.bat +++ b/git-push-tree.bat @@ -20,7 +20,7 @@ set FONPATH3=%HOMEDRIVE%%HOMEPATH%\faronear ) else ( echo ××× none of the testing path is valid. echo; - echo === Enter [fonpath] or leave [blank] for default to '.' + echo === Enter or leave for default to '.' set /p FONPATH=">>> " echo; if "" == "%FONPATH%" ( diff --git a/git-push-tree.sh b/git-push-tree.sh index c4f0c59..4102a0d 100755 --- a/git-push-tree.sh +++ b/git-push-tree.sh @@ -6,7 +6,7 @@ then else echo "××× All testing path failed." echo "" - echo "=== Enter [fonpath] or leave [blank] for default to '.'" + echo "=== Enter or leave for default to '.'" read -p ">>> " FONPATH echo "" if [ ! "$FONPATH" ] @@ -17,7 +17,7 @@ fi if [ ! -d "$FONPATH" ] then - echo "××× [$FONPATH] not exist! Exit now. ***" + echo "××× <$FONPATH> not exist! Exit now. ***" exit else echo "√√√ FONPATH = $FONPATH" @@ -27,7 +27,7 @@ pushd $FONPATH echo "*** Starting from [`pwd`] ***" echo "" -echo "=== Enter [commit message] or leave [blank] for default to 'updated'" +echo "=== Enter or for default to 'updated'" read -p ">>> " COMMIT_MESSAGE if [ ! "$COMMIT_MESSAGE" ] then @@ -35,7 +35,10 @@ then fi echo "" -if [ "$2" == 'hier' ] +echo "=== Enter for hierarchical, for recursive, for listing" +read -p ">>> " ACTION_TYPE + +if [ "$ACTION_TYPE" == 'h' ] then # for org in `ls -F | grep '/$' | grep -v '~'` ## 首先过滤出所有子目录,然后过滤出所有不含 ~ 的子目录。注意 for ??? in `ls ???` 是按照空行以及空格进行分割的,因此最后筛选出的目录名不能含有空格,否则就被分割成多个了。 ls -F | grep '/$' | grep -v 'node_modules' | while read org ## 换用这种方法,可以成功过滤出含有空格的完整目录名 @@ -56,7 +59,8 @@ then done cd .. done -else +elif [ "$ACTION_TYPE" == 'r' ] +then find . -mindepth 1 -maxdepth 3 -type d -name '[^.]*' | grep -E -v 'node_modules uni_modules .deploy_git .git .svn .vscode unpackage _webroot _logstore _datasotre _archive _filestore _ssl' | while read repo do if [ -d "$repo/.git" ] @@ -68,6 +72,14 @@ else popd fi done +else + find . -mindepth 1 -maxdepth 3 -type d -name '[^.]*' | grep -E -v 'node_modules uni_modules .deploy_git .git .svn .vscode unpackage _webroot _logstore _datasotre _archive _filestore _ssl' | while read repo + do + if [ -d "$repo/.git" ] + then + echo "$repo" + fi + done fi popd diff --git a/git-rename-branch.sh b/git-rename-branch.sh index 73e2d5f..08f2cdb 100755 --- a/git-rename-branch.sh +++ b/git-rename-branch.sh @@ -6,7 +6,7 @@ then else echo "××× All testing path failed." echo "" - echo "=== Enter [fonpath] or leave [blank] for default to '.'" + echo "=== Enter or leave for default to '.'" read -p ">>> " FONPATH echo "" if [ ! "$FONPATH" ] @@ -17,7 +17,7 @@ fi if [ ! -d "$FONPATH" ] then - echo "××× [$FONPATH] not exist! Exit now. ***" + echo "××× <$FONPATH> not exist! Exit now. ***" exit else echo "√√√ FONPATH = $FONPATH" diff --git a/npm-boot-tree.bat b/npm-boot-tree.bat index 335b0c7..ffad819 100644 --- a/npm-boot-tree.bat +++ b/npm-boot-tree.bat @@ -20,7 +20,7 @@ set FONPATH3=%HOMEDRIVE%%HOMEPATH%\faronear ) else ( echo ××× none of the testing path is valid. echo; - echo === Enter [fonpath] or leave [blank] for default to '.' + echo === Enter or leave for default to '.' set /p FONPATH=">>> " echo; if "" == "%FONPATH%" ( diff --git a/npm-boot-tree.sh b/npm-boot-tree.sh index c08f5f3..0ee1726 100755 --- a/npm-boot-tree.sh +++ b/npm-boot-tree.sh @@ -6,7 +6,7 @@ then else echo "××× All testing path failed." echo "" - echo "=== Enter [fonpath] or leave [blank] for default to '.'" + echo "=== Enter or leave for default to '.'" read -p ">>> " FONPATH echo "" if [ ! "$FONPATH" ] @@ -17,7 +17,7 @@ fi if [ ! -d "$FONPATH" ] then - echo "××× [$FONPATH] not exist! Exit now. ***" + echo "××× <$FONPATH> not exist! Exit now. ***" exit else echo "√√√ FONPATH = $FONPATH" diff --git a/npm-clear-tree.bat b/npm-clear-tree.bat index cf5ce33..532a7c4 100644 --- a/npm-clear-tree.bat +++ b/npm-clear-tree.bat @@ -15,7 +15,7 @@ set FONPATH= ) else ( echo ××× none of the testing path is valid. echo; - echo === Enter [fonpath] or leave [blank] for default to '.' + echo === Enter or leave for default to '.' set /p FONPATH=">>> " echo; if "" == "%FONPATH%" ( diff --git a/seafile-ignore-tree.bat b/seafile-ignore-tree.bat index 1807c9e..bc83811 100644 --- a/seafile-ignore-tree.bat +++ b/seafile-ignore-tree.bat @@ -20,7 +20,7 @@ set FONPATH3=%HOMEDRIVE%%HOMEPATH%\faronear ) else ( echo ××× none of the testing path is valid. echo; - echo === Enter [fonpath] or leave [blank] for default to '.' + echo === Enter or leave for default to '.' set /p FONPATH=">>> " echo; if "" == "%FONPATH%" ( diff --git a/seafile-ignore-tree.sh b/seafile-ignore-tree.sh index 0d1e45d..b77fdf5 100755 --- a/seafile-ignore-tree.sh +++ b/seafile-ignore-tree.sh @@ -6,7 +6,7 @@ then else echo "××× All testing path failed." echo "" - echo "=== Enter [fonpath] or leave [blank] for default to '.'" + echo "=== Enter or leave for default to '.'" read -p ">>> " FONPATH echo "" if [ ! "$FONPATH" ] @@ -17,7 +17,7 @@ fi if [ ! -d "$FONPATH" ] then - echo "××× [$FONPATH] not exist! Exit now. ***" + echo "××× <$FONPATH> not exist! Exit now. ***" exit else echo "√√√ FONPATH = $FONPATH"