From 4b808e2bdecece93131fa16370b303893fb8250e Mon Sep 17 00:00:00 2001 From: Luk Lu Date: Sun, 9 Jul 2023 14:34:25 +0800 Subject: [PATCH] simplify. Not search for target folder, but ask user to enter target folder --- git-ignore-tree.bat | 44 +++++++++-------------------------------- git-pull-tree.sh | 20 +------------------ git-push-tree.sh | 20 +------------------ git-rename-branch.sh | 20 +------------------ nixhome-config.sh | 18 +++-------------- nixhome/.bashrc | 24 ++-------------------- nodejs-install.sh | 4 ++-- npm-boot-tree.sh | 20 +------------------ seafile-ignore-tree.bat | 38 +++++++++-------------------------- seafile-ignore-tree.sh | 20 +------------------ 10 files changed, 30 insertions(+), 198 deletions(-) diff --git a/git-ignore-tree.bat b/git-ignore-tree.bat index ccae557..81b4817 100644 --- a/git-ignore-tree.bat +++ b/git-ignore-tree.bat @@ -35,43 +35,17 @@ if not exist "%FONPATH%" ( echo √√√ FONPATH = %FONPATH% ) -set NIXHOME1=%FONPATH%\fon\sysconfig\nixhome -set NIXHOME2=%FONPATH%\fon.code\sysconfig\nixhome -set NIXHOME3=%FONPATH%\fon\sysconfig.git\nixhome -set NIXHOME4=%FONPATH%\fon.code\sysconfig.git\nixhome -set NIXHOME5=%FONPATH%\sysconfig.git\nixhome -set NIXHOME6=%FONPATH%\sysconfig\nixhome -set NIXHOME7=%CD%\nixhome -echo *** Testing Path [%NIXHOME1%] [%NIXHOME2%] [%NIXHOME3%] [%NIXHOME4%] [%NIXHOME5%] [%NIXHOME6%] [%NIXHOME7%] -if exist "%NIXHOME1%" ( - set NIXHOME=%NIXHOME1% -) else if exist "%NIXHOME2%" ( - set NIXHOME=%NIXHOME2% -) else if exist "%NIXHOME3%" ( - set NIXHOME=%NIXHOME3% -) else if exist "%NIXHOME4%" ( - set NIXHOME=%NIXHOME4% -) else if exist "%NIXHOME5%" ( - set NIXHOME=%NIXHOME5% -) else if exist "%NIXHOME6%" ( - set NIXHOME=%NIXHOME6% -) else if exist "%NIXHOME7%" ( - set NIXHOME=%NIXHOME7% -) else ( - echo ××× none of the testing path is valid. - echo; - echo === Enter [nixhome path] or leave [blank] for default to '.' - set /p NIXHOME=">>> " - echo; - if "" == "%NIXHOME%" ( - set NIXHOME=. - ) +echo === Enter [path to .gitignore] or leave [blank] for default to '.' +set /p GITIGNOREPATH=">>> " +echo; +if "" == "%GITIGNOREPATH%" ( + set GITIGNOREPATH=. ) -if not exist "%NIXHOME%" ( - echo ××× [%NIXHOME%] not exist! Exit now. *** +if not exist "%GITIGNOREPATH%" ( + echo ××× [%GITIGNOREPATH%] not exist! Exit now. *** @ GOTO END ) else ( - echo √√√ NIXHOME = %NIXHOME% + echo √√√ GITIGNOREPATH = %GITIGNOREPATH% ) pushd %FONPATH% @@ -84,7 +58,7 @@ for /d /r %%r in (*) do ( if exist "%%r\.gitignore" ( pushd "%%r" echo ---- updating .gitignore in [%%r] ---- - copy %NIXHOME%\.gitignore %%r\ + copy %GITIGNOREPATH%\.gitignore %%r\ echo; popd ) diff --git a/git-pull-tree.sh b/git-pull-tree.sh index 59608c3..a411efd 100755 --- a/git-pull-tree.sh +++ b/git-pull-tree.sh @@ -1,26 +1,8 @@ #!/bin/bash -FONPATH1=/faronear -FONPATH2=~/faronear.mycode -FONPATH3=~/faronear -FONPATH4=/mnt/d/faronear - -echo "*** Testing [$1] [$FONPATH1] [$FONPATH2] [$FONPATH3] [$FONPATH4]" -if [ "$1" ] +if [ -d "$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 "××× All testing path failed." echo "" diff --git a/git-push-tree.sh b/git-push-tree.sh index 9365b78..c4f0c59 100755 --- a/git-push-tree.sh +++ b/git-push-tree.sh @@ -1,26 +1,8 @@ #!/bin/bash -FONPATH1=/faronear -FONPATH2=~/faronear.mycode -FONPATH3=~/faronear -FONPATH4=/mnt/d/faronear - -echo "*** Testing [$1] [$FONPATH1] [$FONPATH2] [$FONPATH3] [$FONPATH4]" -if [ "$1" ] +if [ -d "$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 "××× All testing path failed." echo "" diff --git a/git-rename-branch.sh b/git-rename-branch.sh index 2ef327e..73e2d5f 100755 --- a/git-rename-branch.sh +++ b/git-rename-branch.sh @@ -1,26 +1,8 @@ #!/bin/bash -FONPATH1=/faronear -FONPATH2=~/faronear.mycode -FONPATH3=~/faronear -FONPATH4=/mnt/d/faronear - -echo "*** Testing [$1] [$FONPATH1] [$FONPATH2] [$FONPATH3] [$FONPATH4]" -if [ "$1" ] +if [ -d "$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 "××× All testing path failed." echo "" diff --git a/nixhome-config.sh b/nixhome-config.sh index 86fcf75..2916015 100755 --- a/nixhome-config.sh +++ b/nixhome-config.sh @@ -1,13 +1,10 @@ #!/bin/bash NIXHOME0=/faronear/sysconfig/nixhome -NIXHOME1=/faronear/npm/sysconfig/nixhome -NIXHOME2=~/faronear/npm/sysconfig/nixhome -NIXHOME3=~/faronear/npm.code/sysconfig/nixhome -NIXHOME4=~/faronear.mycode/npm.code/sysconfig/nixhome -NIXHOME5=`pwd`/nixhome +NIXHOME1=~/sysconfig/nixhome +NIXHOME2=`pwd`/nixhome -if [ "$1" ] +if [ -d "$1" ] then NIXHOME=$1 elif [ -d $NIXHOME0 ] @@ -19,15 +16,6 @@ then elif [ -d $NIXHOME2 ] then NIXHOME=$NIXHOME2 -elif [ -d $NIXHOME3 ] -then - NIXHOME=$NIXHOME3 -elif [ -d $NIXHOME4 ] -then - NIXHOME=$NIXHOME4 -elif [ -d $NIXHOME5 ] -then - NIXHOME=$NIXHOME5 else echo ××× none of the testing path is valid. echo "=== Enter [nixhome path] or leave [blank] to exit" diff --git a/nixhome/.bashrc b/nixhome/.bashrc index c1fb092..7b64807 100644 --- a/nixhome/.bashrc +++ b/nixhome/.bashrc @@ -158,34 +158,14 @@ fi export USERPROFILE=$HOME # # add sysconfig to path -# tp1=/Users/luk.lu/faronear/npm/sysconfig -# tp2=/Users/luk.lu/faronear/npm.code/sysconfig -# tp3=/faronear/npm/sysconfig -# tp4=/faronear/npm.code/sysconfig -# tp5=/mnt/c/faronear/npm.code/sysconfig -# tp6=/mnt/d/faronear/npm.code/sysconfig -# tp7=/faronear/sysconfig +# tp1=/faronear/sysconfig +# tp2=~/sysconfig # if [ -d $tp1 ] # then # export PATH=$tp1:$PATH # elif [ -d $tp2 ] # then # export PATH=$tp2:$PATH -# elif [ -d $tp3 ] -# then -# export PATH=$tp3:$PATH -# elif [ -d $tp4 ] -# then -# export PATH=$tp4:$PATH -# elif [ -d $tp5 ] -# then -# export PATH=$tp5:$PATH -# elif [ -d $tp6 ] -# then -# export PATH=$tp6:$PATH -# elif [ -d $tp7 ] -# then -# export PATH=$tp7:$PATH # fi if [ -f ~/.bashrc_custom ] diff --git a/nodejs-install.sh b/nodejs-install.sh index 5be386b..7843588 100755 --- a/nodejs-install.sh +++ b/nodejs-install.sh @@ -2,13 +2,13 @@ echo "Usage: this-script.sh [VERSION]" -defaultVERSION=18 +defaultVERSION=18.12.1 if [ $1 ] then VERSION=$1 else - echo "=== Enter nodejs version (leave blank for default $defaultVERSION) or 'tools'" + echo "=== Enter or 'tools' or for default $defaultVERSION" read -p ">>> " VERSION if [ ! $VERSION ] then diff --git a/npm-boot-tree.sh b/npm-boot-tree.sh index 4c39b83..c08f5f3 100755 --- a/npm-boot-tree.sh +++ b/npm-boot-tree.sh @@ -1,26 +1,8 @@ #!/bin/bash -FONPATH1=/faronear -FONPATH2=~/faronear.mycode -FONPATH3=~/faronear -FONPATH4=/mnt/d/faronear - -echo "*** Testing [$1] [$FONPATH1] [$FONPATH2] [$FONPATH3] [$FONPATH4]" -if [ "$1" ] +if [ -d "$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 "××× All testing path failed." echo "" diff --git a/seafile-ignore-tree.bat b/seafile-ignore-tree.bat index 0112d6a..1807c9e 100644 --- a/seafile-ignore-tree.bat +++ b/seafile-ignore-tree.bat @@ -35,37 +35,17 @@ if not exist "%FONPATH%" ( echo √√√ FONPATH = %FONPATH% ) -set SCRIPTHOME1=%FONPATH%\fon\sysconfig\nixhome -set SCRIPTHOME2=%FONPATH%\fon.code\sysconfig\nixhome -set SCRIPTHOME3=%FONPATH%\fon\sysconfig.git\nixhome -set SCRIPTHOME4=%FONPATH%\fon.code\sysconfig.git\nixhome -set SCRIPTHOME5=%CD%\nixhome -echo *** Testing Path [%SCRIPTHOME1%] [%SCRIPTHOME2%] [%SCRIPTHOME3%] [%SCRIPTHOME4%] [%SCRIPTHOME5%] -if exist "%SCRIPTHOME1%" ( - set SCRIPTHOME=%SCRIPTHOME1% -) else if exist "%SCRIPTHOME2%" ( - set SCRIPTHOME=%SCRIPTHOME2% -) else if exist "%SCRIPTHOME3%" ( - set SCRIPTHOME=%SCRIPTHOME3% -) else if exist "%SCRIPTHOME4%" ( - set SCRIPTHOME=%SCRIPTHOME4% -) else if exist "%SCRIPTHOME5%" ( - set SCRIPTHOME=%SCRIPTHOME5% -) else ( - echo ××× none of the testing path is valid. - echo; - echo === Enter [nixhome path] or leave [blank] for default to '.' - set /p SCRIPTHOME=">>> " - echo; - if "" == "%SCRIPTHOME%" ( - set SCRIPTHOME=. - ) +echo === Enter [path to seafile-ignore.txt] or leave [blank] for default to '.' +set /p SFIGNOREPATH=">>> " +echo; +if "" == "%SFIGNOREPATH%" ( + set SFIGNOREPATH=. ) -if not exist "%SCRIPTHOME%" ( - echo ××× [%SCRIPTHOME%] not exist! Exit now. *** +if not exist "%SFIGNOREPATH%" ( + echo ××× [%SFIGNOREPATH%] not exist! Exit now. *** @ GOTO END ) else ( - echo √√√ SCRIPTHOME = %SCRIPTHOME% + echo √√√ SFIGNOREPATH = %SFIGNOREPATH% ) pushd %FONPATH% @@ -77,7 +57,7 @@ for /d /r %%r in (*) do ( echo "%%r" | findstr "node_modules uni_modules .deploy_git .git .svn .vscode unpackage _webroot _logstore _datasotre _archive _filestore _ssl" >NUL || ( if exist "%%r\.git" ( echo ---- updating seafile-ignore.txt in [%%r] ---- - copy %SCRIPTHOME%\seafile-ignore.txt %%r\ + copy %SFIGNOREPATH%\seafile-ignore.txt %%r\ echo; ) ) diff --git a/seafile-ignore-tree.sh b/seafile-ignore-tree.sh index f7adfd6..0d1e45d 100755 --- a/seafile-ignore-tree.sh +++ b/seafile-ignore-tree.sh @@ -1,26 +1,8 @@ #!/bin/bash -FONPATH1=/faronear -FONPATH2=~/faronear.mycode -FONPATH3=~/faronear -FONPATH4=/mnt/d/faronear - -echo "*** Testing [$1] [$FONPATH1] [$FONPATH2] [$FONPATH3] [$FONPATH4]" -if [ "$1" ] +if [ -d "$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 "××× All testing path failed." echo ""