lith hace 1 año
padre
commit
0cfcddbaf2

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

@@ -28,9 +28,9 @@ do
 	sed -i 's/net6.0/'"$netVersion"'/g' `find ${basePath} -name *.csproj -exec grep '<publish>' -l {} \;`
 
 
-	echo "#2.3 bash 40.Station-publish.sh"
+	echo "#2.3 sh 40.Station-publish.sh"
 	cd $curPath
-	bash 40.Station-publish.sh
+	sh 40.Station-publish.sh
 
 
 	echo "#2.4 change back netVersion to net6.0 in csproj"

+ 2 - 2
Publish/DevOps2/build-bash/startup.bash

@@ -20,8 +20,8 @@ echo "build-bash/startup.bash"
 for file in *.sh
 do
     echo "-----------------------------------------------------------------"
-    echo "[$(date "+%H:%M:%S")] bash $file"
-    bash $file
+    echo "[$(date "+%H:%M:%S")] sh $file"
+    sh $file
 done
 
 

+ 5 - 5
Publish/DevOps2/github-bash/startup.bash

@@ -32,13 +32,13 @@ cd $curPath
 
 #---------------------------------------------- 
 echo '#1 build'
-cd $basePath/Publish/DevOps2/build-bash; bash startup.bash;
-cd $basePath/Publish/DevOps2/build-bash; bash 40.Station-publish-multiple.bash;
+cd $basePath/Publish/DevOps2/build-bash; sh startup.bash;
+cd $basePath/Publish/DevOps2/build-bash; sh 40.Station-publish-multiple.bash;
 
 
 #---------------------------------------------- 
 echo '#2 release-bash'
-cd $basePath/Publish/DevOps2/release-bash; bash startup.bash;
+cd $basePath/Publish/DevOps2/release-bash; sh startup.bash;
  
 
 
@@ -54,8 +54,8 @@ cd $curPath
 for file in *.sh
 do
     echo "-----------------------------------------------------------------"
-    echo "[$(date "+%H:%M:%S")]" bash $file
-    bash $file
+    echo "[$(date "+%H:%M:%S")]" sh $file
+    sh $file
 done
 
 

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

@@ -25,9 +25,9 @@ export DOCKER_BuildxExtArgs=
 echo "73.docker-image-build-push.sh"
 
 if [ "$DOCKER_Buildx" != "false" ]; then
-	source 75.docker-image-build-push_cross.bash
+	sh 75.docker-image-build-push_cross.bash
 else
-	source 74.docker-image-build-push_amd64.bash
+	sh 74.docker-image-build-push_amd64.bash
 fi
 
 

+ 2 - 2
Publish/DevOps2/release-bash/startup.bash

@@ -45,8 +45,8 @@ cd $curPath
 for file in *.sh
 do
     echo "-----------------------------------------------------------------"
-    echo "[$(date "+%H:%M:%S")] bash $file"
-    bash $file
+    echo "[$(date "+%H:%M:%S")] sh $file"
+    sh $file
 done