diff --git a/git-clone-all.sh b/git-clone-all.sh index 41163f0..360c6c5 100755 --- a/git-clone-all.sh +++ b/git-clone-all.sh @@ -1,13 +1,13 @@ #!/bin/bash -mkdir cup.git -pushd cup.git +mkdir cup.code +pushd cup.code git clone https://git.faronear.org/cup/cmc-user-uniapp git clone https://git.faronear.org/cup/cmc-server-torm popd -mkdir fon.git -pushd fon.git +mkdir fon.code +pushd fon.code git clone https://git.faronear.org/npm/sysconfig git clone https://git.faronear.org/fon/dot.vscode git clone https://git.faronear.org/fon/www.faronear.com @@ -17,8 +17,8 @@ git clone https://git.faronear.org/fon/www.faronear.org git clone https://git.faronear.org/fon/mail.faronear.org popd -mkdir npm.git -pushd npm.git +mkdir npm.code +pushd npm.code git clone https://git.faronear.org/npm/wo-base-fileloader git clone https://git.faronear.org/npm/wo-base-deployer git clone https://git.faronear.org/npm/wo-base-envar @@ -43,8 +43,8 @@ git clone https://git.faronear.org/npm/tic-chaintool git clone https://git.faronear.org/npm/tic-traction popd -mkdir sol.git -pushd sol.git +mkdir sol.code +pushd sol.code git clone https://git.faronear.org/sol/sol-ling git clone https://git.faronear.org/sol/sol-data git clone https://git.faronear.org/sol/sol-base @@ -52,8 +52,8 @@ git clone https://git.faronear.org/sol/solet git clone https://git.faronear.org/sol/soweb popd -mkdir tic.git -pushd tic.git +mkdir tic.code +pushd tic.code git clone https://git.faronear.org/tic/cloud-server git clone https://git.faronear.org/tic/cloud-user-vue git clone https://git.faronear.org/tic/star-core-torm @@ -70,8 +70,8 @@ git clone https://git.faronear.org/tex/tex-user-vue popd -mkdir tuc.git -pushd tuc.git +mkdir tuc.code +pushd tuc.code git clone https://git.faronear.org/tuc/fork-tisch git clone https://git.faronear.org/tuc/fork-nesh diff --git a/git-ignore-tree.bat b/git-ignore-tree.bat index 3553ad8..ccae557 100644 --- a/git-ignore-tree.bat +++ b/git-ignore-tree.bat @@ -36,9 +36,9 @@ if not exist "%FONPATH%" ( ) set NIXHOME1=%FONPATH%\fon\sysconfig\nixhome -set NIXHOME2=%FONPATH%\fon.git\sysconfig\nixhome +set NIXHOME2=%FONPATH%\fon.code\sysconfig\nixhome set NIXHOME3=%FONPATH%\fon\sysconfig.git\nixhome -set NIXHOME4=%FONPATH%\fon.git\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 diff --git a/git-pull-tree.sh b/git-pull-tree.sh index 246400c..59608c3 100644 --- a/git-pull-tree.sh +++ b/git-pull-tree.sh @@ -1,7 +1,7 @@ #!/bin/bash FONPATH1=/faronear -FONPATH2=~/faronear.git +FONPATH2=~/faronear.mycode FONPATH3=~/faronear FONPATH4=/mnt/d/faronear diff --git a/git-push-tree.sh b/git-push-tree.sh index f5b318d..9365b78 100644 --- a/git-push-tree.sh +++ b/git-push-tree.sh @@ -1,7 +1,7 @@ #!/bin/bash FONPATH1=/faronear -FONPATH2=~/faronear.git +FONPATH2=~/faronear.mycode FONPATH3=~/faronear FONPATH4=/mnt/d/faronear diff --git a/git-rename-branch.sh b/git-rename-branch.sh index 11a5cfa..2ef327e 100755 --- a/git-rename-branch.sh +++ b/git-rename-branch.sh @@ -1,7 +1,7 @@ #!/bin/bash FONPATH1=/faronear -FONPATH2=~/faronear.git +FONPATH2=~/faronear.mycode FONPATH3=~/faronear FONPATH4=/mnt/d/faronear diff --git a/nixhome-config.sh b/nixhome-config.sh index 523ea0b..86fcf75 100644 --- a/nixhome-config.sh +++ b/nixhome-config.sh @@ -3,8 +3,8 @@ NIXHOME0=/faronear/sysconfig/nixhome NIXHOME1=/faronear/npm/sysconfig/nixhome NIXHOME2=~/faronear/npm/sysconfig/nixhome -NIXHOME3=~/faronear/npm.git/sysconfig/nixhome -NIXHOME4=~/faronear.git/npm.git/sysconfig/nixhome +NIXHOME3=~/faronear/npm.code/sysconfig/nixhome +NIXHOME4=~/faronear.mycode/npm.code/sysconfig/nixhome NIXHOME5=`pwd`/nixhome if [ "$1" ] @@ -94,7 +94,7 @@ then if [ "$(uname)" == "Darwin" ] then - echo '--- No need to run this script on Mac OS X. Exit now.' + echo '--- No need to configure ./ssh/authorized_keys on Mac OS X. Exit now.' elif [ "$TheUser" != 'root' ] # 仅允许 non-root 用户进行远程密钥登录 then diff --git a/nixhome/.bashrc b/nixhome/.bashrc index 0cc5992..c1fb092 100644 --- a/nixhome/.bashrc +++ b/nixhome/.bashrc @@ -157,36 +157,36 @@ fi # let MacOS uses the same variable so that vscode-sshfs can use "$USERPROFILE/.ssh/id_rsa" uniformly. export USERPROFILE=$HOME -# add sysconfig to path -tp1=/Users/luk.lu/faronear/npm/sysconfig -tp2=/Users/luk.lu/faronear/npm.git/sysconfig -tp3=/faronear/npm/sysconfig -tp4=/faronear/npm.git/sysconfig -tp5=/mnt/c/faronear/npm.git/sysconfig -tp6=/mnt/d/faronear/npm.git/sysconfig -tp7=/faronear/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 +# # 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 +# 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 ] then diff --git a/npm-boot-tree.sh b/npm-boot-tree.sh index 7ec3459..4c39b83 100644 --- a/npm-boot-tree.sh +++ b/npm-boot-tree.sh @@ -1,7 +1,7 @@ #!/bin/bash FONPATH1=/faronear -FONPATH2=~/faronear.git +FONPATH2=~/faronear.mycode FONPATH3=~/faronear FONPATH4=/mnt/d/faronear diff --git a/seafile-ignore-tree.bat b/seafile-ignore-tree.bat index 7c45cd2..0112d6a 100644 --- a/seafile-ignore-tree.bat +++ b/seafile-ignore-tree.bat @@ -36,9 +36,9 @@ if not exist "%FONPATH%" ( ) set SCRIPTHOME1=%FONPATH%\fon\sysconfig\nixhome -set SCRIPTHOME2=%FONPATH%\fon.git\sysconfig\nixhome +set SCRIPTHOME2=%FONPATH%\fon.code\sysconfig\nixhome set SCRIPTHOME3=%FONPATH%\fon\sysconfig.git\nixhome -set SCRIPTHOME4=%FONPATH%\fon.git\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%" ( diff --git a/seafile-ignore-tree.sh b/seafile-ignore-tree.sh index 1e73a6e..f7adfd6 100644 --- a/seafile-ignore-tree.sh +++ b/seafile-ignore-tree.sh @@ -1,7 +1,7 @@ #!/bin/bash FONPATH1=/faronear -FONPATH2=~/faronear.git +FONPATH2=~/faronear.mycode FONPATH3=~/faronear FONPATH4=/mnt/d/faronear