diff --git a/git-pull-all.bat b/git-pull-all.bat index c7b5ba9..dfd3b78 100644 --- a/git-pull-all.bat +++ b/git-pull-all.bat @@ -25,17 +25,24 @@ echo *** Current path = [%CD%] *** @REM for /d %%d in (*) do ( pushd %%d & ( for /d %%d in (*) do ( if exist %%d/.git pushd %%d & echo --- git pulling: %%d ... & git pull & popd ) ) & popd ) for /d %%o in (*) do ( + @REM windows的链接文件会造成路径错误,从而终止该循环,从而导致下一轮乃至所有循环的工作目录错误。因此要过滤掉 .vscode 这个符号链接目录。 if not %%o == .vscode ( - pushd %%o - for /d %%g in (*) do ( - if exist %%g/.git ( - pushd %%g - echo --- git pulling: %%g ... - git pull - popd + @REM 每次 git pull 都会造成 .git 目录下某些文件变化,导致云端不断自动同步。因此过滤掉 *@cloud 的目录不做更新。 + echo %%o | findstr "@cloud" && ( + echo omitting [%BASEDIR%\%%o] + ) || ( + echo entering [%BASEDIR%\%%o] + pushd %%o + for /d %%g in (*) do ( + if exist %%g/.git ( + pushd %%g + echo git pulling [%BASEDIR%\%%o\%%g] + git pull + popd + ) ) + popd ) - popd ) ) diff --git a/git-pull-all.sh b/git-pull-all.sh index 88d1d26..e769c0b 100755 --- a/git-pull-all.sh +++ b/git-pull-all.sh @@ -30,16 +30,17 @@ fi pushd $FONPATH echo "*** Current path = [`pwd`] ***" -for org in `ls .` +for org in `ls | grep -v @cloud` do if [ -d $org ] then + echo " entering [$FONPATH/$org]" cd $org; for repo in `ls .` do if [ -d $repo/.git ] then - echo "--- git pulling: $org/$repo" + echo " git pulling [$FONPATH/$org/$repo]" cd $repo git pull cd .. diff --git a/npm-boot-all.bat b/npm-boot-all.bat index 13302f3..408b597 100644 --- a/npm-boot-all.bat +++ b/npm-boot-all.bat @@ -26,16 +26,21 @@ echo *** Current path = [%CD%] *** for /d %%o in (*) do ( if not %%o == .vscode ( - pushd %%o - for /d %%g in (*) do ( - if exist %%g/package.json ( - pushd %%g - echo --- npm booting: %%g ... - npm run boot - popd + echo %%o | findstr "@cloud" && ( + echo omitting [%BASEDIR%\%%o] + ) || ( + echo entering [%BASEDIR%\%%o] + pushd %%o + for /d %%g in (*) do ( + if exist %%g/package.json ( + pushd %%g + echo npm booting [%BASEDIR%\%%o\%%g] + npm run boot + popd + ) ) - ) - popd + popd + ) ) ) diff --git a/npm-boot-all.sh b/npm-boot-all.sh index eff4177..85eeafa 100755 --- a/npm-boot-all.sh +++ b/npm-boot-all.sh @@ -30,7 +30,7 @@ fi pushd $FONPATH echo "*** Current path = [`pwd`] ***" -for org in `ls .` +for org in `ls | grep -v @cloud` do if [ -d $org ] then