From a9f0bab20f80c91aa6f21a471f634dbec86108bb Mon Sep 17 00:00:00 2001
From: Jaifroid <egk10@cam.ac.uk>
Date: Sat, 27 Apr 2024 09:04:47 +0100
Subject: [PATCH] Correct some misnamed file renames

---
 scripts/Publish-ElectronPackages.ps1       | 2 +-
 scripts/publish_linux_packages_to_kiwix.sh | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/Publish-ElectronPackages.ps1 b/scripts/Publish-ElectronPackages.ps1
index b396de28..dc5d9472 100644
--- a/scripts/Publish-ElectronPackages.ps1
+++ b/scripts/Publish-ElectronPackages.ps1
@@ -152,7 +152,7 @@ if (-not $githubonly) {
             # Convert back appname to hyphens
             $filename = $filename -replace 'kiwix_js_(electron|windows)', 'kiwix-js-$1'
             # Fix Windows Portable version so that it is clear it is portable for Windows
-            $filename = $filename -replace 'electron(?!_(setup|win7|web))(.+\.exe)$', 'electron_win_portable$1'
+            $filename = $filename -replace 'electron(?!_(?:setup|win7|web))(.+\.exe)$', 'electron_win_portable$1'
             # Fix Windows Setup version so that it is clear it is a Windows executable
             $filename = $filename -replace 'electron_setup', 'electron_win_setup'
             # Fix Windows Web Setup version so that it is clear it is a Windows executable
diff --git a/scripts/publish_linux_packages_to_kiwix.sh b/scripts/publish_linux_packages_to_kiwix.sh
index 39af93da..c4f379f5 100644
--- a/scripts/publish_linux_packages_to_kiwix.sh
+++ b/scripts/publish_linux_packages_to_kiwix.sh
@@ -31,7 +31,7 @@ for file in ./dist/bld/Electron/* ; do
         filename=$(sed -E 's/\.(i686|x86)/_\1/' <<<"$filename")
         # Swap order of architecture and release number
         filename=$(sed -E 's/(electron)(.+)(_(i[36]86|x86)[^.]*)/\1\3\2/' <<<"$filename")
-        if [[ $filename =~ \.appimage && (! $filename =~ i386) ]]; then
+        if [[ $filename =~ \.appimage && (! $filename =~ i386 )(! $filename =~ arm64) ]]; then
             filename=$(sed -E 's/(electron)(.)/\1_x86-64\2/' <<<"$filename")
         fi
         if [[ "qq${CRON_LAUNCHED}" != "qq" ]]; then 
@@ -40,6 +40,7 @@ for file in ./dist/bld/Electron/* ; do
             # Add date to filename
             filename=$(sed -E "s/[^_]+(\.[^.]+)$/$CURRENT_DATE\1/" <<<"$filename")
         fi
+        echo "Renaming $file to $filename"
         # Put it all together
         renamed_file="$directory$filename"
         if [[ "$file" != "$renamed_file" ]]; then