From 2021fba89eb428d34e1b0164f33baf9edfc80ac8 Mon Sep 17 00:00:00 2001
From: Luk Lu <luk.lu@faronear.org>
Date: Thu, 12 Jan 2023 20:05:07 +0800
Subject: [PATCH] u

---
 debian-add-user.sh           | 44 ------------------------
 debian-config.sh             |  1 +
 seafile-ignore-recursive.bat |  2 --
 seafile-ignore-recursive.sh  | 65 ++++++++++++++++++++++++++++++++++++
 4 files changed, 66 insertions(+), 46 deletions(-)
 create mode 100644 seafile-ignore-recursive.sh

diff --git a/debian-add-user.sh b/debian-add-user.sh
index 9632ad9..3bddd87 100755
--- a/debian-add-user.sh
+++ b/debian-add-user.sh
@@ -34,47 +34,3 @@ else
   echo "--- Nothing changed."
 fi
 echo
-
-SCRIPTHOME0=/faronear/sysconfig
-SCRIPTHOME1=/faronear/fon/sysconfig
-SCRIPTHOME2=~/faronear/fon/sysconfig
-SCRIPTHOME3=~/faronear/fon.git/sysconfig
-SCRIPTHOME4=~/faronear.git/fon.git/sysconfig
-
-if [ -d $SCRIPTHOME0 ]
-then
-  SCRIPTHOME=$0
-elif [ -d $SCRIPTHOME1 ]
-then 
-  SCRIPTHOME=$SCRIPTHOME1
-elif [ -d $SCRIPTHOME2 ]
-then
-  SCRIPTHOME=$SCRIPTHOME2
-elif [ -d $SCRIPTHOME3 ]
-then
-  SCRIPTHOME=$SCRIPTHOME3
-elif [ -d $SCRIPTHOME4 ]
-then
-  SCRIPTHOME=$SCRIPTHOME4
-elif [ -d $SCRIPTHOME5 ]
-then
-  SCRIPTHOME=$SCRIPTHOME5
-else
-  echo "=== Enter [script path] or leave [blank] to exit"
-  read -p ">>> " SCRIPTHOME
-  echo ""
-  if [ ! -d "$SCRIPTHOME" ]
-  then 
-    echo "*** nixhome path [$SCRIPTHOME] not available! Exit now. ***"
-    exit
-  fi
-fi
-
-echo "=== Configure $NewUser's home with standard scripts? <y> for yes, <anything else> for no"
-read -p ">>> " ConfigHome
-if [ "$ConfigHome" == 'y' ]
-then
-  source $SCRIPTHOME/home-config.sh $SCRIPTHOME/nixhome $NewUser
-else
-  echo "--- Nothing configured."
-fi
diff --git a/debian-config.sh b/debian-config.sh
index 37c0b05..0c7bd62 100755
--- a/debian-config.sh
+++ b/debian-config.sh
@@ -102,6 +102,7 @@ read -p ">>> " AddNewUser
 if [ "$AddNewUser" == 'y' ]
 then
   source /faronear/sysconfig/debian-add-user.sh $NewUser
+  source /faronear/sysconfig/home-config.sh /faronear/sysconfig/nixhome $NewUser
 
   echo
   echo "=== Enable xfce autologin [/etc/lightdm/lightdm.conf]: <y> for autologin as [$NewUser] or <anything else> for no change:"
diff --git a/seafile-ignore-recursive.bat b/seafile-ignore-recursive.bat
index 4a1ffac..8f62d0e 100644
--- a/seafile-ignore-recursive.bat
+++ b/seafile-ignore-recursive.bat
@@ -74,11 +74,9 @@ for /d /r %%r in (*) do (
   @REM @ if not "%%r" == ".vscode" (
   echo "%%r" | findstr "node_modules uni_modules .deploy_git .git .svn .vscode unpackage _webroot _logstore _datasotre _archive _filestore _ssl" >NUL || (
     if exist "%%r\.git" (
-      pushd "%%r"
       echo ---- updating seafile-ignore.txt in [%%r] ----
       copy %SCRIPTHOME%\seafile-ignore.txt %%r\
       echo;
-      popd
     )
   )
 )
diff --git a/seafile-ignore-recursive.sh b/seafile-ignore-recursive.sh
new file mode 100644
index 0000000..2abe2ff
--- /dev/null
+++ b/seafile-ignore-recursive.sh
@@ -0,0 +1,65 @@
+#!/bin/bash
+
+FONPATH1=/faronear
+FONPATH2=~/faronear.git
+FONPATH3=~/faronear
+FONPATH4=/mnt/d/faronear
+
+echo "*** Testing [$FONPATH1] [$FONPATH2] [$FONPATH3] [$FONPATH4]"
+if [ "$1" ]
+then
+  FONPATH=$1
+elif [ -d $FONPATH1 ]
+then 
+  FONPATH=$FONPATH1
+elif [ -d $FONPATH2 ]
+then
+  FONPATH=$FONPATH2
+elif [ -d $FONPATH3 ]
+then
+  FONPATH=$FONPATH3
+elif [ -d $FONPATH4 ]
+then
+  FONPATH=$FONPATH4
+else
+  echo "=== Enter [fonpath] or leave [blank] for default to '.'"
+  read -p ">>> " FONPATH
+  echo ""
+  if [ ! "$FONPATH" ]
+  then
+    FONPATH=.
+  fi
+fi
+
+if [ ! -d "$FONPATH" ]
+then 
+  echo "××× [$FONPATH] not exist! Exit now. ***"
+  exit
+else
+  echo "√√√ FONPATH = $FONPATH"
+fi
+
+cd $FONPATH
+echo "*** Starting from [`pwd`] ***"
+echo ""
+
+echo "=== Enter [path-to-seafile-ignore.txt]"
+read -p ">>> " SFIGNOREPATH
+echo ""
+if [ ! -f "$SFIGNOREPATH/seafile-ignore.txt" ]
+then
+  echo "××× Not existed [$SFIGNOREPATH/seafile-ignore.txt]. Exit now..."
+  exit
+fi
+
+find . -mindepth 1 -maxdepth 3 -type d -name '[^.]*' | grep -E -v 'node_modules uni_modules .deploy_git .git .svn .vscode unpackage _webroot _logstore _datasotre _archive _filestore _ssl' | while read repo
+do 
+  if [ -d "$repo/.git" ]
+  then
+    echo "---- updating seafile-ignore.txt in [$repo] ----"
+    cp $SFIGNOREPATH/seafile-ignore.txt $repo/
+    echo ""
+  fi
+done
+
+cd -