lith 1 anno fa
parent
commit
f001dc8db1

+ 2 - 8
Publish/DevOps2/release-bash/71.file-zip.sh

@@ -16,13 +16,6 @@ export APPNAME=xxxxxx
 #----------------------------------------------
 echo "71.file-zip.sh"
 
-
-if [ ! -d "$basePath/Publish/release/release" ] 
-then
-	echo '71.file-zip.sh -> skip for no files exist'
-	echo exit 0
-fi
-
 docker run --rm -i \
 -v $basePath:/root/code \
 serset/filezip bash -c "
@@ -33,7 +26,8 @@ rm -rf \$releasePath/release-zip
 
 for dirname in \`ls /root/code/Publish/release/release\`
 do
-  if [ -d \$releasePath/release/\$dirname ] then
+  if [ -d \$releasePath/release/\$dirname ]
+  then
     filezip zip -p -i \$releasePath/release/\$dirname -o \$releasePath/release-zip/${APPNAME}-\${dirname}-${appVersion}.zip 
   fi
 done

+ 3 - 10
Publish/DevOps2/release-bash/72.nuget-push.sh

@@ -14,24 +14,17 @@ export NUGET_KEY=xxxxxxxxxx
 # "
 
 
+nugetPath=Publish/release/release/nuget
+ 
 
 #----------------------------------------------
 echo "72.nuget-push.sh"
-
 docker run -i --rm \
 --env LANG=C.UTF-8 \
 -v $basePath:/root/code \
 serset/dotnet:sdk-6.0 \
 bash -c "
-
-
-if [ ! -d \"/root/code/Publish/release/release/nuget\" ]; then
-    echo '72.nuget-push.sh -> skip for no nuget files exist'
-    exit 0
-fi
-
-
-for file in /root/code/Publish/release/release/nuget/*.nupkg
+for file in /root/code/$nugetPath/*.nupkg
 do
     echo nuget push \$file
     dotnet nuget push \$file -k ${NUGET_KEY} -s ${NUGET_SERVER} --skip-duplicate