From 7d3cf980727821686ba31ffa55718266f73dc689 Mon Sep 17 00:00:00 2001
From: Luk <luk@faronear.org>
Date: Wed, 17 Apr 2024 08:58:12 +0800
Subject: [PATCH] add *.aab/ipa to .gitignore_global in addition to *.apk

---
 git-ignore-find2merge.bat     | 16 +---------------
 git-pull-tree.bat             | 28 +++++++---------------------
 git-push-tree.bat             | 28 +++++++---------------------
 git-rename-branch.bat         | 21 +++++++--------------
 nixhome/.gitignore_global     |  2 ++
 npm-boot-tree.bat             | 28 +++++++---------------------
 npm-clear-tree.bat            | 26 ++++++++------------------
 scp-pubkey-to-remote.bat      |  2 +-
 seafile-ignore-find2merge.bat | 30 ++++++++----------------------
 uniapp-cli.sh                 |  8 ++++----
 10 files changed, 52 insertions(+), 137 deletions(-)

diff --git a/git-ignore-find2merge.bat b/git-ignore-find2merge.bat
index 781a70d..285a6a6 100644
--- a/git-ignore-find2merge.bat
+++ b/git-ignore-find2merge.bat
@@ -3,22 +3,9 @@
 @REM 首先清除可能残留的变量
 set ROOTPATH=
 
-set ROOTPATH1=D:\faronear
-set ROOTPATH2=C:\faronear
-set ROOTPATH3=%HOMEDRIVE%%HOMEPATH%\faronear
-
 @ if not "" == "%1" (
   set ROOTPATH=%1
 ) else (
-echo *** Testing Path [[%ROOTPATH1%]]  [[%ROOTPATH2%]]  [[%ROOTPATH3%]]
-  if exist "%ROOTPATH1%" (
-    set ROOTPATH=%ROOTPATH1%
-  ) else if exist "%ROOTPATH2%" (
-    set ROOTPATH=%ROOTPATH2%
-  ) else if exist "%ROOTPATH3%" (
-    set ROOTPATH=%ROOTPATH3%
-  ) else (
-    echo ××× none of the testing path is valid.
     echo;
     echo === Enter [root path] or [leave blank] for default [[%CD%]] to start tree search for .gitignore files
     set /p ROOTPATH=">>> "
@@ -28,7 +15,6 @@ echo *** Testing Path [[%ROOTPATH1%]]  [[%ROOTPATH2%]]  [[%ROOTPATH3%]]
     ) else (
       for %P in (%ROOTPATH%) do set "ROOTPATH=%~dpnxP"
     )
-  )
 )
 if not exist "%ROOTPATH%" (
   echo ××× [[%ROOTPATH%]] not exist! Exit now. ***
@@ -53,7 +39,7 @@ if not exist "%IGNOREPATH%" (
 )
 
 pushd %ROOTPATH%
-echo *** Starting from [[%CD%]] ***
+echo === Starting from [[%CD%]] ===
 echo;
 
 for /d /r %%r in (*) do (
diff --git a/git-pull-tree.bat b/git-pull-tree.bat
index 8f7457b..a89e6d1 100644
--- a/git-pull-tree.bat
+++ b/git-pull-tree.bat
@@ -3,29 +3,15 @@
 @REM 首先清除可能残留的变量
 set ROOTPATH=
 
-set ROOTPATH1=D:\faronear
-set ROOTPATH2=C:\faronear
-set ROOTPATH3=%HOMEDRIVE%%HOMEPATH%\faronear
-
 @ if not "" == "%1" (
   set ROOTPATH=%1
 ) else (
-echo *** Testing Path [[%ROOTPATH1%]]  [[%ROOTPATH2%]]  [[%ROOTPATH3%]]
-  if exist "%ROOTPATH1%" (
-    set ROOTPATH=%ROOTPATH1%
-  ) else if exist "%ROOTPATH2%" (
-    set ROOTPATH=%ROOTPATH2%
-  ) else if exist "%ROOTPATH3%" (
-    set ROOTPATH=%ROOTPATH3%
-  ) else (
-      echo ××× none of the testing path is valid.
-      echo;
-      echo === Enter [root path]> or [leave blank] for default to [[%CD%]]
-      set /p ROOTPATH=">>> "
-      echo;
-      if "" == "%ROOTPATH%" (
-        set ROOTPATH=%CD%
-      )
+  echo;
+  echo === Enter [root path]> or [leave blank] for default to [[%CD%]]
+  set /p ROOTPATH=">>> "
+  echo;
+  if "" == "%ROOTPATH%" (
+    set ROOTPATH=%CD%
   )
 )
 
@@ -37,7 +23,7 @@ if not exist "%ROOTPATH%" (
 )
 
 pushd %ROOTPATH%
-echo *** Starting from [[%CD%]] ***
+echo === Starting from [[%CD%]] ===
 echo;
 
 @ if "%2" == "hier" (
diff --git a/git-push-tree.bat b/git-push-tree.bat
index ffc9b09..339a236 100644
--- a/git-push-tree.bat
+++ b/git-push-tree.bat
@@ -3,29 +3,15 @@
 @REM 首先清除可能残留的变量
 set ROOTPATH=
 
-set ROOTPATH1=D:\faronear
-set ROOTPATH2=C:\faronear
-set ROOTPATH3=%HOMEDRIVE%%HOMEPATH%\faronear
-
 @ if not "" == "%1" (
   set ROOTPATH=%1
 ) else (
-echo *** Testing Path [[%ROOTPATH1%]]  [[%ROOTPATH2%]]  [[%ROOTPATH3%]]
-  if exist "%ROOTPATH1%" (
-    set ROOTPATH=%ROOTPATH1%
-  ) else if exist "%ROOTPATH2%" (
-    set ROOTPATH=%ROOTPATH2%
-  ) else if exist "%ROOTPATH3%" (
-    set ROOTPATH=%ROOTPATH3%
-  ) else (
-      echo ××× none of the testing path is valid.
-      echo;
-      echo === Enter [root path] or [leave blank] for default to [[%CD%]]
-      set /p ROOTPATH=">>> "
-      echo;
-      if "" == "%ROOTPATH%" (
-        set ROOTPATH=%CD%
-      )
+  echo;
+  echo === Enter [root path] or [leave blank] for default to [[%CD%]]
+  set /p ROOTPATH=">>> "
+  echo;
+  if "" == "%ROOTPATH%" (
+    set ROOTPATH=%CD%
   )
 )
 
@@ -37,7 +23,7 @@ if not exist "%ROOTPATH%" (
 )
 
 pushd %ROOTPATH%
-echo *** Starting from [[%CD%]] ***
+echo === Starting from [[%CD%]] ===
 echo;
 
 echo === Enter [commit message] or [leave blank] for default to 'updated'
diff --git a/git-rename-branch.bat b/git-rename-branch.bat
index 8b43c37..441cbba 100755
--- a/git-rename-branch.bat
+++ b/git-rename-branch.bat
@@ -3,22 +3,15 @@
 @REM 首先清除可能残留的变量
 set ROOTPATH=
 
-set ROOTPATH1=D:\faronear
-set ROOTPATH2=C:\faronear
-set ROOTPATH3=%HOMEDRIVE%%HOMEPATH%\faronear
-
 @ if not "" == "%1" (
   set ROOTPATH=%1
 ) else (
-echo *** Testing Path [[%ROOTPATH1%]]  [[%ROOTPATH2%]]  [[%ROOTPATH3%]]
-  if exist "%ROOTPATH1%" (
-    set ROOTPATH=%ROOTPATH1%
-  ) else if exist "%ROOTPATH2%" (
-    set ROOTPATH=%ROOTPATH2%
-  ) else if exist "%ROOTPATH3%" (
-    set ROOTPATH=%ROOTPATH3%
-  ) else (
-    set ROOTPATH=..\..
+  echo;
+  echo === Enter [root path]> or [leave blank] for default to [[%CD%]]
+  set /p ROOTPATH=">>> "
+  echo;
+  if "" == "%ROOTPATH%" (
+    set ROOTPATH=%CD%
   )
 )
 
@@ -30,7 +23,7 @@ if not exist %ROOTPATH% (
 )
 
 pushd %ROOTPATH%
-echo *** Current path = [[%CD%]] ***
+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 )
 
diff --git a/nixhome/.gitignore_global b/nixhome/.gitignore_global
index b316cfd..09cdbe8 100644
--- a/nixhome/.gitignore_global
+++ b/nixhome/.gitignore_global
@@ -23,7 +23,9 @@
 /test/unit/coverage/
 /test/e2e/reports/
 node_modules/
+*.aab
 *.apk
+*.ipa
 *.min.js
 *.min.css
 *.min.html
diff --git a/npm-boot-tree.bat b/npm-boot-tree.bat
index 863b95a..5994ba8 100644
--- a/npm-boot-tree.bat
+++ b/npm-boot-tree.bat
@@ -3,29 +3,15 @@
 @REM 首先清除可能残留的变量
 set ROOTPATH=
 
-set ROOTPATH1=D:\faronear
-set ROOTPATH2=C:\faronear
-set ROOTPATH3=%HOMEDRIVE%%HOMEPATH%\faronear
-
 @ if not "" == "%1" (
   set ROOTPATH=%1
 ) else (
-echo *** Testing Path [[%ROOTPATH1%]]  [[%ROOTPATH2%]]  [[%ROOTPATH3%]]
-  if exist "%ROOTPATH1%" (
-    set ROOTPATH=%ROOTPATH1%
-  ) else if exist "%ROOTPATH2%" (
-    set ROOTPATH=%ROOTPATH2%
-  ) else if exist "%ROOTPATH3%" (
-    set ROOTPATH=%ROOTPATH3%
-  ) else (
-      echo ××× none of the testing path is valid.
-      echo;
-      echo === Enter [root path] or [leave blank] for default to [[%CD%]]
-      set /p ROOTPATH=">>> "
-      echo;
-      if "" == "%ROOTPATH%" (
-        set ROOTPATH=%CD%
-      )
+  echo;
+  echo === Enter [root path] or [leave blank] for default to [[%CD%]]
+  set /p ROOTPATH=">>> "
+  echo;
+  if "" == "%ROOTPATH%" (
+    set ROOTPATH=%CD%
   )
 )
 
@@ -37,7 +23,7 @@ if not exist "%ROOTPATH%" (
 )
 
 pushd %ROOTPATH%
-echo *** Starting from [[%CD%]] ***
+echo === Starting from [[%CD%]] ===
 echo;
 
 @ if "%2" == "hier" (
diff --git a/npm-clear-tree.bat b/npm-clear-tree.bat
index f3987d3..e9ab61d 100644
--- a/npm-clear-tree.bat
+++ b/npm-clear-tree.bat
@@ -6,24 +6,14 @@ set ROOTPATH=
 @ if not "" == "%1" (
   set ROOTPATH=%1
 ) else (
-  if exist D:\faronear (
-    set ROOTPATH=D:\faronear
-  ) else (if exist C:\faronear (
-    set ROOTPATH=C:\faronear
-  ) else (if exist %HOMEDRIVE%%HOMEPATH%\faronear (
-    set ROOTPATH=%HOMEDRIVE%%HOMEPATH%\faronear
-  ) else (
-      echo ××× none of the testing path is valid.
-      echo;
-      echo === Enter [root path] or [leave blank] for default to [[%CD%]]
-      set /p ROOTPATH=">>> "
-      echo;
-      if "" == "%ROOTPATH%" (
-        set ROOTPATH=%CD%
-      )
-  )))
+  echo;
+  echo === Enter [root path] or [leave blank] for default to [[%CD%]]
+  set /p ROOTPATH=">>> "
+  echo;
+  if "" == "%ROOTPATH%" (
+    set ROOTPATH=%CD%
+  )
 )
-
 if not exist "%ROOTPATH%" (
   echo ××× [[%ROOTPATH%]] not exist! Exit now. ***
   @ GOTO END
@@ -32,7 +22,7 @@ if not exist "%ROOTPATH%" (
 )
 
 pushd %ROOTPATH%
-echo *** Starting from [[%CD%]] ***
+echo === Starting from [[%CD%]] ===
 echo;
 
 for /d /r %%r in (*) do (
diff --git a/scp-pubkey-to-remote.bat b/scp-pubkey-to-remote.bat
index e18057c..70d4660 100644
--- a/scp-pubkey-to-remote.bat
+++ b/scp-pubkey-to-remote.bat
@@ -1,6 +1,6 @@
 @echo off 
 
-echo *** Append ~/.ssh/id_rsa.pub to remote server
+echo === Append ~/.ssh/id_rsa.pub to remote server ===
 
 @ if not "%1" == "" (
   set REMOTEHOST=%1
diff --git a/seafile-ignore-find2merge.bat b/seafile-ignore-find2merge.bat
index 433adb9..7cbf644 100644
--- a/seafile-ignore-find2merge.bat
+++ b/seafile-ignore-find2merge.bat
@@ -3,31 +3,17 @@
 @REM 首先清除可能残留的变量
 set ROOTPATH=
 
-set ROOTPATH1=D:\faronear
-set ROOTPATH2=C:\faronear
-set ROOTPATH3=%HOMEDRIVE%%HOMEPATH%\faronear
-
 @ if not "" == "%1" (
   set ROOTPATH=%1
 ) else (
-echo *** Testing Path [[%ROOTPATH1%]]  [[%ROOTPATH2%]]  [[%ROOTPATH3%]]
-  if exist "%ROOTPATH1%" (
-    set ROOTPATH=%ROOTPATH1%
-  ) else if exist "%ROOTPATH2%" (
-    set ROOTPATH=%ROOTPATH2%
-  ) else if exist "%ROOTPATH3%" (
-    set ROOTPATH=%ROOTPATH3%
+  echo;
+  echo === Enter [root path] or [leave blank] for default [[%CD%]] to start tree search for seafile-ignore.txt files
+  set /p ROOTPATH=">>> "
+  echo;
+  if "" == "%ROOTPATH%" (
+    set ROOTPATH=%CD%
   ) else (
-    echo ××× none of the testing path is valid.
-    echo;
-    echo === Enter [root path] or [leave blank] for default [[%CD%]] to start tree search for seafile-ignore.txt files
-    set /p ROOTPATH=">>> "
-    echo;
-    if "" == "%ROOTPATH%" (
-      set ROOTPATH=%CD%
-    ) else (
-      for %P in (%ROOTPATH%) do set "ROOTPATH=%~dpnxP"
-    )
+    for %P in (%ROOTPATH%) do set "ROOTPATH=%~dpnxP"
   )
 )
 if not exist "%ROOTPATH%" (
@@ -53,7 +39,7 @@ if not exist "%IGNOREPATH%" (
 )
 
 pushd %ROOTPATH%
-echo *** Starting from [[%CD%]] ***
+echo === Starting from [[%CD%]] ===
 echo;
 
 for /d /r %%r in (*) do (
diff --git a/uniapp-cli.sh b/uniapp-cli.sh
index 1dde266..3505976 100755
--- a/uniapp-cli.sh
+++ b/uniapp-cli.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 
-echo *** 把 HBuilder 创建的 uniapp 应用转换成 vue-cli 应用的脚手架。
-echo *** More info at https://uniapp.dcloud.net.cn/quickstart-cli.html
+echo === 把 HBuilder 创建的 uniapp 应用转换成 vue-cli 应用的脚手架。
+echo === More info at https://uniapp.dcloud.net.cn/quickstart-cli.html
 
 echo === CLI project name? 
 read -p '>>> ' PROJECT
@@ -16,11 +16,11 @@ then
   echo === Originial Repository URL?
   read -p '>>> ' $url
   echo 
-  echo *** 下载一个 HBuilderX 创建的项目下载存为 src 目录:
+  echo === 下载一个 HBuilderX 创建的项目下载存为 src 目录:
   echo
   git clone $url src
   echo
-  echo *** 进入 src 安装依赖库
+  echo === 进入 src 安装依赖库
   cd src
   npm run boot
   cd ..