diff --git a/.gitignore b/.gitignore index 71b65cd..4018bbe 100644 --- a/.gitignore +++ b/.gitignore @@ -5,7 +5,7 @@ # https://github.com/SlideWave/gitignore-include?tab=readme-ov-file#examples # https://gitignore.io -### .gitignore.global.txt ### +### .gitignore_global ### # Self defined pattern to ignore ?*.gitignore @@ -30,13 +30,16 @@ .deploy_git/ .idea/ .sass-cache/ -.wrangler +.wrangler/ /test/unit/coverage/ /test/e2e/reports/ node_modules/ *.aab *.apk *.ipa +*.rar +*.tgz +*.zip *.min.js *.min.css *.min.html @@ -58,22 +61,8 @@ Thumbs.db thumbs.db _desktop.ini -# vue-cli 项目 -/dist/ - -# 来自 vue-cli 创建项目的 .gitignore -.project - -# hexo -/public/ - -# Hardhat -/artifacts/ -/cache/ - # seafile 临时文件 ._* - .$* # office 暂存文件 @@ -92,22 +81,5 @@ _desktop.ini .env.local .env.*.local -# hexo -/db.json - -# wo -# 服务端 -/_archive/* -/_datastore/* -/_filestore/* -/_logstore/* -/_webroot/* -/_ssl/* -# uniapp 客户端 -/unpackage/* -!/unpackage/res/ -package-lock.json -pages4loader.json5 - ### .gitignore.local.txt ### diff --git a/git-ignore-find2merge.sh b/git-ignore-find2merge.sh index 3d9efea..b0abded 100755 --- a/git-ignore-find2merge.sh +++ b/git-ignore-find2merge.sh @@ -26,7 +26,9 @@ else fi echo "" -echo "::*** Enter [path to .gitignore_global] or [leave blank] for default [[https://git.tic.cc/opx/sysconfig/raw/branch/main/nixhome/.gitignore_global]]" +GLOBALPATH_DEFAULT=https://git.tic.cc/opx/sysconfig/raw/branch/main/nixhome/.gitignore_global + +echo "::*** Enter [path to .gitignore_global] or [leave blank] for default [[$GLOBALPATH_DEFAULT]]" read -p "***:: " GLOBALPATH if [ "$GLOBALPATH" ] then @@ -42,7 +44,7 @@ then echo "√√√ GLOBALPATH = [[$GLOBALPATH]]" fi else - GLOBALPATH=https://git.tic.cc/opx/sysconfig/raw/branch/main/nixhome/.gitignore_global + GLOBALPATH=GLOBALPATH_DEFAULT fi echo "" @@ -57,7 +59,7 @@ cd $ROOTPATH echo "*** Starting from [[`pwd`]] ***" echo "" -find . -mindepth 1 -maxdepth 3 -type d -name '[^.]*' | grep -E -v 'node_modules|uni_modules|\.deploy_git|\.git|.svn|\.vscode|\.wrangler|unpackage|_webroot|_logstore|_datasotre|_archive|_filestore|_ssl' | while read repo +find . -mindepth 0 -maxdepth 3 -type d -name '[^.]*' | grep -E -v 'node_modules|uni_modules|\.deploy_git|\.git|.svn|\.vscode|\.wrangler|unpackage|_webroot|_logstore|_datasotre|_archive|_filestore|_ssl' | while read repo do if [ -f "$repo/.gitignore" ] # some git repo need to keep privacy, therefore judge from .gitignore, not from .git then diff --git a/nixhome/.gitignore_global b/nixhome/.gitignore_global index 460d0c8..4018bbe 100644 --- a/nixhome/.gitignore_global +++ b/nixhome/.gitignore_global @@ -61,20 +61,6 @@ Thumbs.db thumbs.db _desktop.ini -# vue-cli 项目 -/dist/ - -# 来自 vue-cli 创建项目的 .gitignore -.project - -# hexo -/public/ -/db.json - -# Hardhat -/artifacts/ -/cache/ - # seafile 临时文件 ._* .$* @@ -95,19 +81,5 @@ _desktop.ini .env.local .env.*.local -# wo -# 服务端 -/_archive/* -/_datastore/* -/_filestore/* -/_logstore/* -/_webroot/* -/_ssl/* -# uniapp 客户端 -/unpackage/* -!/unpackage/res/ -package-lock.json -pages4loader.json5 - ### .gitignore.local.txt ###