try build

XTsat · Mar 17, 2022 · f721c66 · f721c66
1 parent a8c7a6f
commit f721c66
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/packaging/build-osx-app.sh b/packaging/build-osx-app.sh
@@ -43,9 +43,9 @@ emit_plist() {
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleExecutable</key>
-	<string>$PLIST_APPNAME</string>
+	<string>${{ Steam++_RunName }}</string>
 	<key>CFBundleGetInfoString</key>
-	<string>$PLIST_APPNAME</string>
+	<string>${{ Steam++_RunName }}</string>
 	<key>CFBundleIconFile</key>
 	<string>$PLIST_APPNAME</string>
 	<key>CFBundlePackageType</key>
@@ -80,7 +80,6 @@ rm -rf "$APPDIR"
 create_app_structure "$APPNAME"
 emit_plist "$APPNAME" "$APPDIR" true
 
-mv -f "${{ Steam++_APPDIR }}" "./MacOS"
-chmod +x "./MacOS/Steam++"
-
-mv -f "${{ Steam++_OutPutFilePath }}/$APPNAME.app" "${{ Steam++_APPDIR }}"
+mv -f "${{ Steam++_APPDIR }}" "$APPDIR/MacOS"
+chmod +x "$APPDIR/MacOS/Steam++"
+mv -f "${{ Steam++_OutPutFilePath }}/$BINARYNAME.app" "${{ Steam++_APPDIR }}/$BINARYNAME.app"
diff --git a/src/ST.Tools.Publish/Steps/Step_cd.cs b/src/ST.Tools.Publish/Steps/Step_cd.cs
@@ -570,14 +570,16 @@ static void OSXBuild(bool dev, string[] osx_val)
                     Console.WriteLine($"找不到 destPath 文件夹，值：{destPath}");
                     continue;
                 }
-                var appName = $"Steam++{(item == "osx-x64" ? "" : " Arm64")}";
+                var isArm = item == "osx-x64";
+                var appName = $"Steam++{(isArm ? "" : " Arm64")}";
                 var shFileContent2 = shFileContent
                         .Replace("${{ Steam++_AppName }}", appName)
                         .Replace("${{ Steam++_Version }}", CFBundleVersion)
                         .Replace("${{ Steam++_ShortVersion }}", CFBundleShortVersionString)
                         .Replace("${{ Steam++_IcnsFile }}", icnsFilePath)
                         .Replace("${{ Steam++_OutPutFilePath }}", projPath)
                         .Replace("${{ Steam++_APPDIR }}", destPath)
+                        .Replace("${{ Steam++_RunName }}", "Steam++")
                         ;
                 File.WriteAllText(shFilePath, shFileContent2);