Publish/DevOps2/build-bash/19.get-app-version.bash

@@ -5,7 +5,7 @@ set -e
 
 
 #---------------------------------------------------------------------
-#(x.1)参数
+# args
 args_="
 
 export versionSuffix='  '

Publish/DevOps2/build-bash/20.change-app-version.bash

@@ -5,7 +5,7 @@ set -e
 
 
 #---------------------------------------------------------------------
-#(x.1)参数
+# args
 args_="
 
 export versionSuffix='  '

Publish/DevOps2/build-bash/21.change-to-next-version.bash

@@ -5,7 +5,7 @@ set -e
 
 
 #---------------------------------------------------------------------
-#(x.1)参数
+# args
 args_="
 
 export versionSuffix='  '
@@ -16,7 +16,7 @@ export versionSuffix='  '
 versionSuffix=${versionSuffix// /}
 
 #----------------------------------------------
-#(x.2)当前路径 
+# curPath
 curPath=$PWD
 
 cd $curPath/../../..

Publish/DevOps2/build-bash/30.nuget-pack.sh

@@ -4,7 +4,7 @@ set -e
 
 
 #---------------------------------------------------------------------
-#(x.1)参数
+# args
 args_="
 
 export basePath=/root/temp/svn
@@ -20,7 +20,7 @@ nugetPath=Publish/release/release/nuget
 
 
 #----------------------------------------------
-echo "(x.2)nuget-pack"
+echo "30.nuget-pack.sh"
 docker run -i --rm \
 --env LANG=C.UTF-8 \
 -v $NUGET_PATH:/root/.nuget \

Publish/DevOps2/build-bash/40.Station-publish-multiple.bash

@@ -2,7 +2,7 @@ set -e
 
 
 #---------------------------------------------------------------------
-# 参数
+# args
 args_="
 
 export basePath=/root/temp/svn

Publish/DevOps2/build-bash/40.Station-publish.sh

@@ -2,7 +2,7 @@ set -e
 
 
 #---------------------------------------------------------------------
-# �数
+# args
 args_="
 
 export basePath=/root/temp/svn
@@ -14,7 +14,7 @@ if [ ! $NUGET_PATH ]; then NUGET_PATH=$basePath/Publish/release/.nuget; fi
 
 
 #----------------------------------------------
-echo "40.Station-publish.sh 查找所有需��布的项目并�布"
+echo "40.Station-publish.sh find projects and build"
 
 
 
@@ -72,7 +72,7 @@ mkdir -p \"\$basePath/Publish/release/release/ServiceCenter(\$netVersion)\"
 
 
 
-echo 'publish succeed�'
+echo 'publish succeed£¡'
 
 
 

Publish/DevOps2/build-bash/50.docker-image-create.sh

@@ -2,7 +2,7 @@ set -e
 
 
 #---------------------------------------------------------------------
-# ��㺭
+# args
 args_="
 
 export basePath=/root/temp/svn
@@ -35,8 +35,8 @@ do
 done
 
 
-echo "#3 copy �蓥��𧢲�"
-\cp -rf "$basePath/Publish/release/release/StressTest/�蓥��𧢲�net6.0/ServiceCenter/." "$dockerPath/sers-demo-sersall/app"
- 
+echo "#3 copy 等极揤聆"
+\cp -rf "$basePath/Publish/release/release/StressTest/等极揤聆net6.0/ServiceCenter/." "$dockerPath/sers-demo-sersall/app"
+
 
 

Publish/DevOps2/build-bash/51.docker-deploy-copy.sh

@@ -2,7 +2,7 @@ set -e
 
 
 #---------------------------------------------------------------------
-#(x.1)��㺭
+# args
 args_="
 
 export basePath=/root/temp/svn
@@ -31,8 +31,8 @@ echo "(x.4)copy station"
 \cp -rf "$publishPath/Gover/appsettings.json" "$deployPath/sers-gover"
 \cp -rf "$publishPath/Demo/appsettings.json" "$deployPath/sers-demo"
 \cp -rf "$publishPath/Robot/appsettings.json" "$deployPath/sers-demo-robot"
-\cp -rf "$basePath/Publish/release/release/StressTest/�蓥��𧢲�net6.0/ServiceCenter/appsettings.json" "$deployPath/sers-demo-sersall"
- 
+\cp -rf "$basePath/Publish/release/release/StressTest/等极揤聆net6.0/ServiceCenter/appsettings.json" "$deployPath/sers-demo-sersall"
+
 
 
 

Publish/DevOps2/build-bash/startup.bash

@@ -3,7 +3,7 @@ set -e
 # cd /root/docker-data/dev/jenkins/jenkins_home/workspace/Repo/Sers/code/Publish/DevOps/build-bash;bash startup.bash;
 
 #----------------------------------------------
-# cur path 
+# cur path
 curPath=$PWD
 
 cd $curPath/../../..
@@ -28,5 +28,5 @@ done
 
  
 #----------------------------------------------
-#9
+#
 cd $curPath

Publish/DevOps2/github-bash/75.github-push-to-serset-release.sh

@@ -2,7 +2,7 @@ set -e
 
 
 #---------------------------------------------------------------------
-#(x.1)参数
+# args
 args_="
 
 export basePath=/root/temp/svn
@@ -20,14 +20,14 @@ export GIT_SSH_SECRET=xxxxxx
 
 
 #----------------------------------------------
-echo "github-提交release文件到serset/release仓库"
+echo "github-push release file to repo serset/release"
 # releaseFile=$basePath/Publish/release/release-zip
 
-#复制ssh key
+# ssh key
 echo "${GIT_SSH_SECRET}" > $basePath/Publish/release/serset
 chmod 600 $basePath/Publish/release/serset
 
-#推送到github
+# push to github
 docker run -i --rm \
 -v $basePath/Publish/release:/root/release serset/git-client bash -c "
 set -e

Publish/DevOps2/github-bash/76.github-push-release.sh

@@ -2,7 +2,7 @@ set -e
 
 
 #---------------------------------------------------------------------
-#(x.1)参数
+# args
 args_="
 
 export basePath=/root/temp/svn
@@ -18,7 +18,7 @@ export APPNAME=xxxxxx
 
 
 #---------------------------------------------------------------------
-#(x.2)构建github release环境变量
+#2 init environment for github release
 
 
 

Publish/DevOps2/github-bash/startup.bash

@@ -3,7 +3,7 @@ set -e
 # cd /root/temp/svn/Publish/DevOps2/github-bash;bash startup.bash;
 
 #---------------------------------------------------------------------
-#(x.1)参数
+# args
 args_="
 
 export APPNAME=xxxxxx
@@ -19,7 +19,7 @@ export GIT_SSH_SECRET=xxxxxx
 # "
 
 #----------------------------------------------
-#(x.2)当前路径
+# cur path
 curPath=$PWD
 
 cd $curPath/../../..
@@ -31,26 +31,26 @@ cd $curPath
 
 
 #---------------------------------------------- 
-echo '(x.4)build'
+echo '#1 build'
 cd $basePath/Publish/DevOps2/build-bash; bash startup.bash;
 cd $basePath/Publish/DevOps2/build-bash; bash 40.Station-publish-multiple.bash;
 
 
 #---------------------------------------------- 
-echo '(x.5)release-bash'
+echo '#2 release-bash'
 cd $basePath/Publish/DevOps2/release-bash; bash startup.bash;
  
 
 
 #----------------------------------------------
-echo "(x.3)get version" 
+echo "#3 get version" 
 export version=`grep '<Version>' $(grep '<pack>\|<publish>' ${basePath} -r --include *.csproj -l | head -n 1) | grep -oP '>(.*)<' | tr -d '<>'`
 echo $version
 
 
 
 #----------------------------------------------
-#(x.4)bash
+echo "#4 bash"
 cd $curPath
 for file in *.sh
 do

Publish/DevOps2/jenkins-bash/00.svn-checkout.bash

@@ -1,5 +1,5 @@
 
-#(x.1)参数
+# args
 args_="
 basePath=/root/docker-data/dev/jenkins/jenkins_home/workspace/Repo/Sers
 export SVN_PATH=svn://svn.ki.lith.cloud/Sers2.1/Sers
@@ -7,12 +7,12 @@ export SVN_USERNAME=jenkins
 export SVN_PASSWORD=xxxxxx
 # "
 
-#(x.2)创建文件夹
+#2 create dir
 mkdir -p $basePath/code
 chmod 777 $basePath/code
 
 
 
-#(x.3)从svn拉取code
+#3 pull code from svn
 docker run -it --rm -v $basePath/code:/root/svn serset/svn-client svn checkout "$SVN_PATH" /root/svn --username "$SVN_USERNAME" --password "$SVN_PASSWORD" --no-auth-cache
 

Publish/DevOps2/jenkins-bash/01.svn-update.sh

@@ -3,7 +3,7 @@ set -e
 # cd /root/docker-data/dev/jenkins/jenkins_home/workspace/Repo/Sers/code/Publish/DevOps/jenkins-bash; bash 01.svn-update.sh
 
 #---------------------------------------------------------------------
-#(x.1)参数
+# args
 args_="
 export SVN_USERNAME=jenkins
 export SVN_PASSWORD=xxxxxx
@@ -11,7 +11,7 @@ export SVN_PASSWORD=xxxxxx
 
 
 #---------------------------------------------------------------------
-#(x.2)当前路径
+# cur path
 curPath=$PWD
 
 cd $curPath/../../..
@@ -23,15 +23,15 @@ cd $curPath
 
 
 #---------------------------------------------------------------------
-#(x.3)cleanup
+#3 cleanup
 docker run -i --rm -v $basePath:/root/svn serset/svn-client svn cleanup /root/svn --remove-unversioned
 
 
-#(x.4)revert
+#4 revert
 docker run -i --rm -v $basePath:/root/svn serset/svn-client svn revert /root/svn -R
 
 
-#(x.5)拉取最新代码
+#5 push latest code
 docker run -i --rm -v $basePath:/root/svn serset/svn-client svn update /root/svn --username "$SVN_USERNAME" --password "$SVN_PASSWORD" --no-auth-cache
 
 

Publish/DevOps2/jenkins-bash/06.svn-createReleaseBranch.bash

@@ -4,7 +4,7 @@ set -e
 
 
 #---------------------------------------------------------------------
-# (x.1)参数
+# args
 args_="
   export      codePath=/root/docker-cache/jenkins/jenkins_home/workspace/Sers/develop/20/code-with-prod-version
   export      SVN_PATH=svn://svn.ki.lith.cloud/Sers

Publish/DevOps2/jenkins-bash/07.svn-changeToNextTempVersion.bash

@@ -4,7 +4,7 @@ set -e
 
 
 #---------------------------------------------------------------------
-# (x.1)参数
+# args
 args_="
   export      codePath=/root/docker-cache/jenkins/jenkins_home/workspace/Sers/develop/20/code-with-prod-version
   export      SVN_PATH=svn://svn.ki.lith.cloud/Sers

Publish/DevOps2/release-bash/71.file-zip.sh

@@ -2,7 +2,7 @@ set -e
 
 
 #---------------------------------------------------------------------
-#(x.1)参数
+# args
 args_="
 
 export basePath=/root/temp/svn
@@ -14,7 +14,7 @@ export APPNAME=xxxxxx
 # "
 
 #----------------------------------------------
-echo "压缩文件"
+echo "71.file-zip.sh"
 
 docker run --rm -i \
 -v $basePath:/root/code \

Publish/DevOps2/release-bash/72.nuget-push.sh

@@ -3,7 +3,7 @@ set -e
 
 
 #---------------------------------------------------------------------
-#(x.1)参数
+# args
 args_="
 
 export basePath=/root/temp/svn
@@ -18,7 +18,7 @@ nugetPath=Publish/release/release/nuget
  
 
 #----------------------------------------------
-echo "(x.2)nuget-push"
+echo "72.nuget-push.sh"
 docker run -i --rm \
 --env LANG=C.UTF-8 \
 -v $basePath:/root/code \

Publish/DevOps2/release-bash/73.docker-image-build-push.sh

@@ -2,7 +2,7 @@ set -e
 
 
 #---------------------------------------------------------------------
-#(x.1)参数
+# args
 args_="
 
 export basePath=/root/temp/svn

Publish/DevOps2/release-bash/74.docker-image-build-push_amd64.bash

@@ -2,7 +2,7 @@ set -e
 
 
 #---------------------------------------------------------------------
-#(x.1)参数
+# args
 args_="
 
 export basePath=/root/temp/svn

Publish/DevOps2/release-bash/75.docker-image-build-push_cross.bash

@@ -2,7 +2,7 @@ set -e
 
 
 #---------------------------------------------------------------------
-#(x.1)参数
+# args
 args_="
 
 export basePath=/root/temp/svn
@@ -27,19 +27,19 @@ export builderName="mybuilder__${appVersion}__"
 echo "builderName: $builderName"
 
 
-echo "#1.1 验证是否开启"
+echo "#1.1 docker buildx version"
 docker buildx version
 
-echo "#1.2 启用binfmt_misc"
+echo "#1.2 install binfmt_misc"
 docker run --privileged --rm tonistiigi/binfmt --install all
 
-echo "#1.3 创建构建器"
+echo "#1.3 create builder"
 if [ ! "$(docker buildx ls | grep $builderName)" ]; then docker buildx create --use --name $builderName --buildkitd-flags '--allow-insecure-entitlement security.insecure'; fi
 
-echo "#1.4 启动构建器"
+echo "#1.4 start builder"
 docker buildx inspect $builderName --bootstrap
 
-echo "#1.5 查看当前使用的构建器及支持的CPU架构"
+echo "#1.5 show builders and supported CPU platform"
 docker buildx ls
 
 
@@ -67,5 +67,5 @@ done
 
 
 #---------------------------------------------------------------------
-echo "75.docker-image-build-push_cross.bash -> #3 docker - remove buildx"
+echo "75.docker-image-build-push_cross.bash -> #3 remove builder"
 if [ "$(docker buildx ls | grep $builderName)" ]; then docker buildx rm $builderName; fi

Publish/DevOps2/release-bash/startup.bash

@@ -3,7 +3,7 @@ set -e
 # cd /root/temp/svn/Publish/DevOps/release-bash;bash startup.bash;
 
 #---------------------------------------------------------------------
-#(x.1)参数
+# args
 args_="
 
 export APPNAME=xxxxxx
@@ -19,7 +19,7 @@ export NUGET_KEY=xxxxxxxxxx
 
 
 #----------------------------------------------
-#(x.2)当前路径
+# cur path
 curPath=$PWD
 
 cd $curPath/../../..
@@ -31,7 +31,7 @@ cd $curPath
 
 
 #----------------------------------------------
-echo "(x.3)get appVersion"
+echo "#1 get appVersion"
 export appVersion=`grep '<Version>' $(find ${basePath} -name *.csproj -exec grep '<pack>\|<publish>' -l {} \; | head -n 1) | grep -oE '\>(.*)\<' | tr -d '<>/'`
 echo appVersion: $appVersion
 
@@ -41,7 +41,7 @@ echo appVersion: $appVersion
 
 
 #----------------------------------------------
-#(x.4)bash
+echo "#2 bash"
 
 for file in *.sh
 do