From 42f28e34bd2fc5f389a13d7a2c88091039df6805 Mon Sep 17 00:00:00 2001
From: Alexander Frick <Alex313031@gmail.com>
Date: Tue, 10 Oct 2023 00:02:27 -0500
Subject: [PATCH]  update portable scripts

---
 infra/portable/make_portable_linux.sh | 15 +++++++++------
 infra/portable/make_portable_win.sh   |  4 ++--
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/infra/portable/make_portable_linux.sh b/infra/portable/make_portable_linux.sh
index d24e808b..bd1515a3 100755
--- a/infra/portable/make_portable_linux.sh
+++ b/infra/portable/make_portable_linux.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (c) 2022 Alex313031.
+# Copyright (c) 2023 Alex313031.
 
 YEL='\033[1;33m' # Yellow
 RED='\033[1;31m' # Red
@@ -30,8 +30,6 @@ printf "\n" &&
 printf "${bold}${RED}NOTE: You must place the Thorium .deb file in this directory before running.${c0}\n" &&
 printf "${bold}${RED}   AND you must have p7zip-full and zip installed.${c0}\n" &&
 printf "\n" &&
-printf "${bold}${RED} - Make sure to rename the .zip properly as per https://github.com/Alex313031/Thorium/discussions/28#discussioncomment-3031799 ${c0}\n" &&
-printf "${YEL}\n" &&
 
 read -p "Press Enter to continue or Ctrl + C to abort."
 printf "\n" &&
@@ -41,6 +39,11 @@ printf "${c0}\n" &&
 
 sleep 2 &&
 
+BASENAME=$(basename -- *.deb) &&
+FILENAME="${BASENAME%.deb}" &&
+
+export FILENAME &&
+
 # Extract data.tar.xz
 mkdir -v -p ./temp &&
 mkdir -v -p ./out &&
@@ -60,8 +63,8 @@ printf "\n" &&
 printf "${YEL}Zipping up...\n" &&
 printf "${c0}\n" &&
 
-# Build Appimage
-cd temp; zip -r ../out/zipped_thorium.zip * &&
+# Build zip
+cd temp; zip -r ../out/${FILENAME}.zip * &&
 
 printf "\n" &&
 printf "${YEL}Cleaning up...\n" &&
@@ -80,6 +83,6 @@ rm -r -v ./debian-binary &&
 rm -r -v ./temp &&
 
 printf "\n" &&
-printf "${GRE}Done! ${YEL}Zip at //out/zipped_thorium.zip\n - Remember to rename it with the version before distributing it.\n" &&
+printf "${GRE}Done! ${YEL}Zip at //out/*.zip\n" &&
 printf "\n" &&
 tput sgr0
diff --git a/infra/portable/make_portable_win.sh b/infra/portable/make_portable_win.sh
index ad33fc17..947ecd2e 100755
--- a/infra/portable/make_portable_win.sh
+++ b/infra/portable/make_portable_win.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (c) 2022 Alex313031.
+# Copyright (c) 2023 Alex313031.
 
 YEL='\033[1;33m' # Yellow
 RED='\033[1;31m' # Red
@@ -57,7 +57,7 @@ printf "\n" &&
 printf "${YEL}Zipping up...\n" &&
 printf "${c0}\n" &&
 
-# Build Appimage
+# Build zip
 cd temp; zip -r ../out/zipped_thorium_win.zip * &&
 
 printf "\n" &&