From e1683a2d0a8e8921666cf2507495dbb9c71ea759 Mon Sep 17 00:00:00 2001
From: Luk <luk@faronear.org>
Date: Wed, 24 Apr 2024 14:01:19 +0800
Subject: [PATCH] u

---
 .DS_Store                                   | Bin 0 -> 6148 bytes
 git-ignore-find2merge.sh                    |  17 +++++++++++----
 .gitignore => nixhome/.gitignore.global.txt |  22 ++++++++++++--------
 seafile-ignore-find2merge.sh                |  15 ++++++++++---
 4 files changed, 38 insertions(+), 16 deletions(-)
 create mode 100644 .DS_Store
 rename .gitignore => nixhome/.gitignore.global.txt (90%)

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..f5841d4ba51725c0de6c56f67115be4334c93865
GIT binary patch
literal 6148
zcmeHKy-or_5dIcO#NSXE%j>Mv;1is1J^{Ty90p9lBMOO~_XyS|Ha>w5p_T7oWnp2g
zEG+$IcY}8zgvuB*lgxZ~vopJM-;o;zfT;~zRiFZ(Ocg9F()=K@E;=Cv?^z)l*`wR8
zHsYk$pNLe)Uu8hvT?yN0;}nD3``i3n%C7a2C~9_-CVl0%=<eqE>Txf>-kQ1I?__=(
z2h0Q(aK=+F(LsV9PI9Lgcj}W7*&3eWc(=Y~YZ%+7mwZ<;Jt|jE@m}g##RX!Vv!*@<
zIAnE09Mi^Qwc%xLc67GR+rh`{`ul@$HDmv5&GTjC>%W%zRg?i`KpB{q0rqT>^0Gs<
z%78MU42&3%??XTp3_Yd}?WcprjsV0G-Bx%lvxMXX9z&0*L#|MaOC`Eg<3|kR(&-O;
zT<9@%=+a^Q@L~MP#!o25p3eOP8x9jXRI3aq19=9D?zSTRe}DS?pHI>|Wk4DDR}7d^
z)QD<)B;Q*n9!`2~Ks}<0NL=c0l)?+!iWw`dc!O$%{y;8>p~uuAJrw;TU};dJ4E!ns
EUmGEKHUIzs

literal 0
HcmV?d00001

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