From 85c1d1750fc04b54ddc29b7df089a3c9b115bba5 Mon Sep 17 00:00:00 2001
From: Davide Cavalca <dcavalca@fedoraproject.org>
Date: Thu, 20 Jul 2023 10:00:28 -0700
Subject: [PATCH] builder: more packaging bugfixes

---
 builder.py                      | 36 +++++++++++++++++++++++----------
 make-asahi-installer-package.sh |  2 +-
 2 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/builder.py b/builder.py
index 6a1206e..5baae8f 100755
--- a/builder.py
+++ b/builder.py
@@ -126,18 +126,32 @@ def packageBuild(target):
     # TODO: rewrite in python instead of shelling out
     runCommand(["./make-asahi-installer-package.sh"])
 
-    package = f"fedora-{RELEASE}-{target['id']}-{TODAY}.zip"
-    os.rename(f"fedora-{RELEASE}-{TODAY}.zip", package)
-    with open("installer_data.json", "r") as f:
+    base = f"fedora-{RELEASE}-{target['id']}-{TODAY}"
+    os.rename(f"fedora-{RELEASE}-{TODAY}.zip", f"{base}.zip")
+    os.rename(f"fedora-{RELEASE}-{TODAY}.logs.zip", f"{base}.logs.zip")
+    os.rename(f"fedora-{RELEASE}-{TODAY}.raw.zst", f"{base}.raw.zst")
+    os.rename(f"fedora-{RELEASE}-{TODAY}.json", f"{base}.json")
+    with open(f"{base}.json", "r") as f:
         data = json.load(f)
 
-    data["os_list"][0]["name"] = target["name"]
-    data["os_list"][0]["default_os_name"] = target["os_name"]
-    data["os_list"][0]["package"] = package
+    data["name"] = target["name"]
+    data["default_os_name"] = target["os_name"]
+    data["package"] = f"{base}.zip"
 
-    with open("installer_data.json", "w") as f:
+    with open(f"{base}.json", "w") as f:
         json.dump(data, f)
 
+    if os.path.exists("installer_data.json"):
+        with open("installer_data.json", "r") as f:
+            data = json.load(f)
+
+        data["os_list"][0]["name"] = target["name"]
+        data["os_list"][0]["default_os_name"] = target["os_name"]
+        data["os_list"][0]["package"] = f"{base}.zip"
+
+        with open("installer_data.json", "w") as f:
+            json.dump(data, f)
+
 
 def uploadToS3(source, destination):
     s3 = boto3.client("s3")
@@ -147,8 +161,8 @@ def uploadToS3(source, destination):
 def packageUpload(target):
     base = f"fedora-{RELEASE}-{target['id']}-{TODAY}"
     package = f"{base}.zip"
-    logs_package = f"{base}-logs.zip"
-    image = f"{base}.raw.zstd"
+    logs_package = f"{base}.logs.zip"
+    image = f"{base}.raw.zst"
     manifest = f"{base}.json"
 
     uploadToS3(package, f"os/{package}")
@@ -202,9 +216,9 @@ def package(target):
 
 
 @cli.command()
-@click.argument("target")
 @click.option("--manifest/--no-manifest", default=True)
-def upload(target):
+@click.argument("target")
+def upload(manifest, target):
     if target not in TARGETS.keys():
         fail(f"Unknown target: {target}")
 
diff --git a/make-asahi-installer-package.sh b/make-asahi-installer-package.sh
index ded74f2..82b83ae 100755
--- a/make-asahi-installer-package.sh
+++ b/make-asahi-installer-package.sh
@@ -119,7 +119,7 @@ cp -p \
   outdir/kiwi.result.json \
   "${workdir}/logs/"
 pushd "${workdir}/logs" > /dev/null
-7z a -tzip -r "${basedir}/${package}-logs" .
+7z a -tzip -r "${basedir}/${package}.logs.zip" .
 popd > /dev/null
 
 # Package up the raw image