Merge branch 'master' into server

.ci/pack-macos.sh

@@ -6,7 +6,7 @@ ARCHIVE_FILES=(ygopro.app LICENSE README.md lflist.conf strings.conf system.conf
 
 # TARGET_LOCALE
 # ARCHIVE_SUFFIX
-TARGET_PLATFORM=osx
+TARGET_PLATFORM=darwin
 
 apt update && apt -y install tar git zstd
 git submodule update --init

.ci/pack-windows.sh

@@ -4,7 +4,7 @@ set -o errexit
 
 ARCHIVE_FILES=(ygopro.exe LICENSE README.md lflist.conf strings.conf system.conf cards.cdb script textures deck single pics replay sound bot.conf Bot.exe WindBot locales fonts)
 
-if [[ "$TARGET_LOCALE" == "zh-CN" && ARCHIVE_SUFFIX != "zst" ]]; then
+if [[ "$TARGET_LOCALE" == "zh-CN" && "$ARCHIVE_SUFFIX" != "zst" ]]; then
 	ARCHIVE_FILES=("${ARCHIVE_FILES[@]}" update-koishipro)
 fi
 

.ci/upload-packager.sh

@@ -15,10 +15,8 @@ appName="koishipro"
 handleErrorMessage() {
   rawJsonInput="$1"
   successInfo=$(echo "$rawJsonInput" | jq '.success')
-  statusCode=$(echo "$rawJsonInput" | jq '.statusCode')
   
   if [[ "$successInfo" != "true" ]]; then
-    failMessage=$(echo "$rawJsonInput" | jq '.success')
     echo "$rawJsonInput"
     exit 1
   fi