diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000..f5841d4 Binary files /dev/null and b/.DS_Store differ diff --git a/git-ignore-find2merge.sh b/git-ignore-find2merge.sh index 1dccafb..dcd5963 100644 --- a/git-ignore-find2merge.sh +++ b/git-ignore-find2merge.sh @@ -30,7 +30,10 @@ echo "=== Enter [path to .gitignore.global.txt] or [leave blank] for default [[h read -p ">>> " IGNOREPATH if [ "$IGNOREPATH" ] then - IGNOREPATH=$(realpath $IGNOREPATH)/.gitignore.global.txt + if [ -d "$IGNOREPATH" ] + then + IGNOREPATH=$(realpath $IGNOREPATH)/.gitignore.global.txt + fi if [ ! -f "$IGNOREPATH" ] then echo "××× Not found [[$IGNOREPATH]]. Exit now..." @@ -56,10 +59,16 @@ 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 do - if [ -f "$repo/.gitignore" ] # some git repo need to keep privacy, therefore judge from .gitignore, not from .git + if [ -f "$repo/.gitignore.local.txt" ] # some git repo need to keep privacy, therefore judge from .gitignore, not from .git then - echo "---- updating .gitignore in [[$repo]] ----" - cat $IGNOREPATH $repo/.gitignore.local.txt 2>/dev/null > $repo/.gitignore + echo "---- updating [[$repo/.gitignore]] ----" + if [ -f "$IGNOREPATH" ] + then + cat $IGNOREPATH > $repo/.gitignore + else + curl -sSL $IGNOREPATH | cat > $repo/.gitignore + fi + cat $repo/.gitignore.local.txt 2>/dev/null > $repo/.gitignore echo "" fi done diff --git a/.gitignore b/nixhome/.gitignore.global.txt similarity index 90% rename from .gitignore rename to nixhome/.gitignore.global.txt index 81fa68f..b62fb6a 100644 --- a/.gitignore +++ b/nixhome/.gitignore.global.txt @@ -7,12 +7,17 @@ ### .gitignore.global.txt ### -# Self defined extension to ignore all files/folders containing .gitignore -*.gitignore.* -*.gitignore.*/ -*.gitignore -*.gitignore/ -!.gitignore +# Self defined pattern to ignore +?*.gitignore +?*.gitignore/ +?*.gitignore.* +?*.gitignore.*/ +*.gitomit +*.gitomit/ +*.gitomit.* +*.gitomit.*/ +# 保留 +!.gitkeep # 通用 .svn/ @@ -23,7 +28,9 @@ /test/unit/coverage/ /test/e2e/reports/ node_modules/ +*.aab *.apk +*.ipa *.min.js *.min.css *.min.html @@ -96,8 +103,5 @@ _desktop.ini package-lock.json pages4loader.json5 -# 保留 -!.gitkeep - ### .gitignore.local.txt ### diff --git a/seafile-ignore-find2merge.sh b/seafile-ignore-find2merge.sh index d1dd354..be8c5cf 100644 --- a/seafile-ignore-find2merge.sh +++ b/seafile-ignore-find2merge.sh @@ -30,7 +30,10 @@ echo "=== Enter [path to seafile-ignore.global.txt] or [leave blank] for default read -p ">>> " IGNOREPATH if [ "$IGNOREPATH" ] then - IGNOREPATH=$(realpath $IGNOREPATH)/seafile-ignore.global.txt + if [ -d "$IGNOREPATH" ] + then + IGNOREPATH=$(realpath $IGNOREPATH)/seafile-ignore.global.txt + fi if [ ! -f "$IGNOREPATH" ] then echo "××× Not found [[$IGNOREPATH]]. Exit now..." @@ -58,8 +61,14 @@ find . -mindepth 1 -maxdepth 3 -type d -name '[^.]*' | grep -E -v 'node_modules| do if [ -f "$repo/seafile-ignore.txt" ] then - echo "---- updating seafile-ignore.txt in [[$repo]] ----" - cat $IGNOREPATH $repo/seafile-ignore.local.txt 2>/dev/null > $repo/seafile-ignore.txt + echo "---- updating [[$repo/seafile-ignore.txt]] ----" + if [ -f "$IGNOREPATH" ] + then + cat $IGNOREPATH > $repo/seafile-ignore.txt + else + curl -sSL $IGNOREPATH | cat > $repo/seafile-ignore.txt + fi + cat $repo/seafile-ignore.local.txt 2>/dev/null >> $repo/seafile-ignore.txt echo "" fi done