From 85aad49a29c796df45278335315d8ac2daf6fa9d Mon Sep 17 00:00:00 2001
From: Elias Steurer <i@kelteseth.net>
Date: Wed, 2 Nov 2022 16:39:23 +0100
Subject: [PATCH] Add skip publish step

Change osx base to x64. This no longer crashes the
app and x64 and it still works for arm...
---
 Tools/build_and_publish.py | 4 ++++
 Tools/macos_lipo.py        | 5 +----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Tools/build_and_publish.py b/Tools/build_and_publish.py
index 917e9f2d..e575231b 100644
--- a/Tools/build_and_publish.py
+++ b/Tools/build_and_publish.py
@@ -14,6 +14,7 @@ from util import sftp_exists
 
 if __name__ == "__main__":
     parser = argparse.ArgumentParser(description='Build and Package ScreenPlay')
+    parser.add_argument('-skip_publish', '-skp', action="store_true", dest="skip_publish",  help="Steam password")
     parser.add_argument('-steam_password', '-sp', action="store", dest="steam_password",  help="Steam password")
     parser.add_argument('-hosting_username','-hu', action="store", dest="hosting_username", help="ssh username")
     parser.add_argument('-hosting_password', '-hp', action="store", dest="hosting_password",  help="ssh password")
@@ -97,6 +98,9 @@ if __name__ == "__main__":
         sftp.close()
         ssh.close()
 
+    if args.skip_publish:
+        print("Skip publishing.")
+        sys.exit(0)
     # Make sure to reset to tools path
     os.chdir(tools_path)
     steam_publish.publish(
diff --git a/Tools/macos_lipo.py b/Tools/macos_lipo.py
index 994907fc..2cfaa196 100644
--- a/Tools/macos_lipo.py
+++ b/Tools/macos_lipo.py
@@ -1,11 +1,8 @@
 #!/usr/bin/python3
 from distutils.dir_util import mkpath
 import os
-import shutil
-import pathlib
 from pathlib import Path
 from util import run, run_and_capture_output, cd_repo_root_path
-import warnings
 
 def listfiles(path):
     files = []
@@ -31,7 +28,7 @@ def run_lipo() :
     # Looks like it is ok the contain symlinks otherwise we get these errors for qml plugins:
     # bundle format is ambiguous (could be app or framework)
     # https://bugreports.qt.io/browse/QTBUG-101338
-    run("cp -a build-arm64-osx-release build-universal-osx-release",root_path)
+    run("cp -a build-x64-osx-release build-universal-osx-release",root_path)
 
     apps = ["ScreenPlay","ScreenPlayWallpaper", "ScreenPlayWidget"]
     for app in apps: