From 0c02e806422e6b8281532bbea7d29d77be42db33 Mon Sep 17 00:00:00 2001
From: Samuel <36420837+Samueru-sama@users.noreply.github.com>
Date: Fri, 16 May 2025 18:01:46 -0400
Subject: [PATCH 01/12] make AppImage with sharun and uruntime

---
 scripts/makeappimage_64-bit.sh | 99 +++++++++++++++++++---------------
 1 file changed, 57 insertions(+), 42 deletions(-)

diff --git a/scripts/makeappimage_64-bit.sh b/scripts/makeappimage_64-bit.sh
index 56ed7891d6..56b0107498 100644
--- a/scripts/makeappimage_64-bit.sh
+++ b/scripts/makeappimage_64-bit.sh
@@ -1,49 +1,64 @@
-#!/usr/bin/env bash
+#!/bin/sh
 
-if [ ! -f appimagetool-x86_64.AppImage ]; then
-	APPIMAGETOOL=$(wget -q https://api.github.com/repos/probonopd/go-appimage/releases -O - | sed 's/"/ /g; s/ /\n/g' | grep -o 'https.*continuous.*tool.*86_64.*mage$')
-	wget -q "$APPIMAGETOOL" -O ./appimagetool-x86_64.AppImage
-    chmod +x appimagetool-x86_64.AppImage
+ARCH="$(uname -m)"
+LIB4BN="https://raw.githubusercontent.com/VHSgunzo/sharun/refs/heads/main/lib4bin"
+URUNTIME="https://github.com/VHSgunzo/uruntime/releases/latest/download/uruntime-appimage-dwarfs-$ARCH"
+UPINFO="gh-releases-zsync|$(echo "$GITHUB_REPOSITORY" | tr '/' '|')|latest|*$ARCH.AppImage.zsync"
+VERSION=test
+
+SYS_LIB_DIR="/usr/lib"
+if [ -d /usr/lib/"$ARCH"-linux-gnu ]; then
+	SYS_LIB_DIR=/usr/lib/"$ARCH"-linux-gnu
 fi
 
-if [ ! -f linuxdeploy-x86_64.AppImage ]; then
-    wget https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage
-    chmod +x linuxdeploy-x86_64.AppImage
-fi
+# Prepare AppDir
+mkdir -p ./AppDir/bin
+cd ./AppDir
 
-mkdir ./AppDir/
-mkdir ./AppDir/usr/
-mkdir ./AppDir/usr/bin/
-mkdir ./AppDir/usr/share/
-mkdir ./AppDir/usr/share/applications/
-mkdir ./AppDir/usr/share/icons/
-mkdir ./AppDir/usr/share/icons/hicolor/
-mkdir ./AppDir/usr/share/icons/hicolor/256x256/
-mkdir ./AppDir/usr/share/icons/hicolor/256x256/apps/
+cp -v  ~/ppsspp/SDL/PPSSPPSDL.desktop ./AppDir
+cp -v  ~/ppsspp/icons/hicolor/256x256/apps/ppsspp.png ./
+cp -v  ~/ppsspp/icons/hicolor/256x256/apps/ppsspp.png ./.DirIcon
 
-cp ~/ppsspp/SDL/PPSSPPSDL.desktop ./AppDir/
-cp ~/ppsspp/SDL/PPSSPPSDL.desktop ./AppDir/usr/share/applications/
-cp ~/ppsspp/build/PPSSPPSDL ./AppDir/usr/bin/
-cp -R ~/ppsspp/build/assets ./AppDir/usr/bin/
-cp ~/ppsspp/icons/hicolor/256x256/apps/ppsspp.png ./AppDir/usr/share/icons/hicolor/256x256/apps/
+# ADD LIBRARIES
+wget "$LIB4BN" -O ./lib4bin
+chmod +x ./lib4bin
+xvfb-run -d -- ./lib4bin -p -v -e -s -k \
+	~/ppsspp/build/PPSSPPSDL \
+	/usr/lib/libSDL* \
+	/usr/lib/lib*GL* \
+	/usr/lib/libvulkan* \
+	/usr/lib/dri/* \
+	/usr/lib/libXss.so* \
+	/usr/lib/pulseaudio/* \
+	/usr/lib/pipewire-0.3/* \
+	/usr/lib/spa-0.2/*/*
 
-DESTDIR=AppDir make install
-./linuxdeploy-x86_64.AppImage --appimage-extract-and-run --appdir=AppDir \
-	--exclude-library="libX*" \
-	--exclude-library="libglib*" \
-	--exclude-library="libgobject*" \
-	--exclude-library="libgdk_pixbuf*" \
-	--exclude-library="libwayland*" \
-	--exclude-library="libgmodule*" \
-	--exclude-library="libgio*" \
-	--exclude-library="libxcb*" \
-	--exclude-library="libxkbcommon*" \
-	--exclude-library="libdb*"
+# copy assets dir needs to be next oteh binary
+cp -vr ~/ppsspp/build/assets ./AppDir/bin
 
-rm AppDir/ppsspp.png
-pushd AppDir
-ln -s usr/share/icons/hicolor/256x256/apps/ppsspp.png
-chmod +x AppRun
-popd
-ARCH=x86_64
-VERSION=$(./AppDir/AppRun --version) ./appimagetool-x86_64.AppImage --appimage-extract-and-run AppDir
+# Prepare sharun
+echo "Preparing sharun..."
+ln -s ./bin/PPSSPPSDL ./AppRun
+./sharun -g
+
+# Make AppImage with uruntime
+cd ..
+wget "$URUNTIME" -O ./uruntime
+chmod +x ./uruntime
+
+#Add udpate info to runtime
+echo "Adding update information \"$UPINFO\" to runtime..."
+./uruntime --appimage-addupdinfo "$UPINFO"
+
+echo "Generating AppImage..."
+./uruntime --appimage-mkdwarfs -f \
+	--set-owner 0 --set-group 0 \
+	--no-history --no-create-timestamp \
+	--compression zstd:level=22 -S26 -B8 \
+	--header uruntime \
+	-i ./AppDir -o PPSSPP-"$VERSION"-anylinux-"$ARCH".AppImage
+
+echo "Generating zsync file..."
+zsyncmake ./*.AppImage -u ./*.AppImage
+
+echo "All Done!"

From ac6a8b2491520af6d2ae1bb65dee730072a95cf2 Mon Sep 17 00:00:00 2001
From: Samuel <36420837+Samueru-sama@users.noreply.github.com>
Date: Fri, 16 May 2025 18:02:16 -0400
Subject: [PATCH 02/12] remove 32bit support

---
 scripts/makeappimage_32-bit.sh | 49 ----------------------------------
 1 file changed, 49 deletions(-)
 delete mode 100644 scripts/makeappimage_32-bit.sh

diff --git a/scripts/makeappimage_32-bit.sh b/scripts/makeappimage_32-bit.sh
deleted file mode 100644
index 5361366f4b..0000000000
--- a/scripts/makeappimage_32-bit.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/usr/bin/env bash
-
-if [ ! -f appimagetool-i686.AppImage ]; then
-	APPIMAGETOOL=$(wget -q https://api.github.com/repos/probonopd/go-appimage/releases -O - | sed 's/"/ /g; s/ /\n/g' | grep -o 'https.*continuous.*tool.*i686.*mage$')
-	wget -q "$APPIMAGETOOL" -O ./appimagetool-i686.AppImage
-    chmod +x appimagetool-i686.AppImage
-fi
-
-if [ ! -f linuxdeploy-i386.AppImage ]; then
-    wget https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-i386.AppImage
-    chmod +x linuxdeploy-i386.AppImage
-fi
-
-mkdir ./AppDir/
-mkdir ./AppDir/usr/
-mkdir ./AppDir/usr/bin/
-mkdir ./AppDir/usr/share/
-mkdir ./AppDir/usr/share/applications/
-mkdir ./AppDir/usr/share/icons/
-mkdir ./AppDir/usr/share/icons/hicolor/
-mkdir ./AppDir/usr/share/icons/hicolor/256x256/
-mkdir ./AppDir/usr/share/icons/hicolor/256x256/apps/
-
-cp ~/ppsspp/SDL/PPSSPPSDL.desktop ./AppDir/
-cp ~/ppsspp/SDL/PPSSPPSDL.desktop ./AppDir/usr/share/applications/
-cp ~/ppsspp/build/PPSSPPSDL ./AppDir/usr/bin/
-cp -R ~/ppsspp/build/assets ./AppDir/usr/bin/
-cp ~/ppsspp/icons/hicolor/256x256/apps/ppsspp.png ./AppDir/usr/share/icons/hicolor/256x256/apps/
-
-DESTDIR=AppDir make install
-./linuxdeploy-i386.AppImage --appimage-extract-and-run --appdir=AppDir \
-	--exclude-library="libX*" \
-	--exclude-library="libglib*" \
-	--exclude-library="libgobject*" \
-	--exclude-library="libgdk_pixbuf*" \
-	--exclude-library="libwayland*" \
-	--exclude-library="libgmodule*" \
-	--exclude-library="libgio*" \
-	--exclude-library="libxcb*" \
-	--exclude-library="libxkbcommon*" \
-	--exclude-library="libdb*"
-
-rm AppDir/ppsspp.png
-pushd AppDir
-ln -s usr/share/icons/hicolor/256x256/apps/ppsspp.png
-chmod +x AppRun
-popd
-ARCH=i386
-VERSION=$(./AppDir/AppRun --version) ./appimagetool-i686.AppImage --appimage-extract-and-run AppDir

From 6db37622073beff6bb3c18b68d7c6c5d340ef322 Mon Sep 17 00:00:00 2001
From: Samuel <36420837+Samueru-sama@users.noreply.github.com>
Date: Fri, 16 May 2025 18:03:57 -0400
Subject: [PATCH 03/12] use `SYS_LIB_DIR`

---
 scripts/makeappimage_64-bit.sh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/scripts/makeappimage_64-bit.sh b/scripts/makeappimage_64-bit.sh
index 56b0107498..3b82dc2aab 100644
--- a/scripts/makeappimage_64-bit.sh
+++ b/scripts/makeappimage_64-bit.sh
@@ -24,14 +24,14 @@ wget "$LIB4BN" -O ./lib4bin
 chmod +x ./lib4bin
 xvfb-run -d -- ./lib4bin -p -v -e -s -k \
 	~/ppsspp/build/PPSSPPSDL \
-	/usr/lib/libSDL* \
-	/usr/lib/lib*GL* \
-	/usr/lib/libvulkan* \
-	/usr/lib/dri/* \
-	/usr/lib/libXss.so* \
-	/usr/lib/pulseaudio/* \
-	/usr/lib/pipewire-0.3/* \
-	/usr/lib/spa-0.2/*/*
+	"$SYS_LIB_DIR"/libSDL* \
+	"$SYS_LIB_DIR"/lib*GL* \
+	"$SYS_LIB_DIR"/libvulkan* \
+	"$SYS_LIB_DIR"/dri/* \
+	"$SYS_LIB_DIR"/libXss.so* \
+	"$SYS_LIB_DIR"/pulseaudio/* \
+	"$SYS_LIB_DIR"/pipewire-0.3/* \
+	"$SYS_LIB_DIR"/spa-0.2/*/*
 
 # copy assets dir needs to be next oteh binary
 cp -vr ~/ppsspp/build/assets ./AppDir/bin

From fa2ac608b96dd1e9e8e33180890ef15ca0173a2e Mon Sep 17 00:00:00 2001
From: Samuel <36420837+Samueru-sama@users.noreply.github.com>
Date: Sat, 17 May 2025 18:25:37 -0400
Subject: [PATCH 04/12] use ` xvfb-run -a` since some distros don't support
 `-d` flag

---
 scripts/makeappimage_64-bit.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/makeappimage_64-bit.sh b/scripts/makeappimage_64-bit.sh
index 3b82dc2aab..333261fd8b 100644
--- a/scripts/makeappimage_64-bit.sh
+++ b/scripts/makeappimage_64-bit.sh
@@ -22,7 +22,7 @@ cp -v  ~/ppsspp/icons/hicolor/256x256/apps/ppsspp.png ./.DirIcon
 # ADD LIBRARIES
 wget "$LIB4BN" -O ./lib4bin
 chmod +x ./lib4bin
-xvfb-run -d -- ./lib4bin -p -v -e -s -k \
+xvfb-run -a -- ./lib4bin -p -v -e -s -k \
 	~/ppsspp/build/PPSSPPSDL \
 	"$SYS_LIB_DIR"/libSDL* \
 	"$SYS_LIB_DIR"/lib*GL* \

From 40a9903a932f9546399cc59c3883a097677d31e3 Mon Sep 17 00:00:00 2001
From: Samuel <36420837+Samueru-sama@users.noreply.github.com>
Date: Sat, 17 May 2025 18:31:36 -0400
Subject: [PATCH 05/12] fix cp error

---
 scripts/makeappimage_64-bit.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/makeappimage_64-bit.sh b/scripts/makeappimage_64-bit.sh
index 333261fd8b..24f3155c5e 100644
--- a/scripts/makeappimage_64-bit.sh
+++ b/scripts/makeappimage_64-bit.sh
@@ -15,7 +15,7 @@ fi
 mkdir -p ./AppDir/bin
 cd ./AppDir
 
-cp -v  ~/ppsspp/SDL/PPSSPPSDL.desktop ./AppDir
+cp -v  ~/ppsspp/SDL/PPSSPPSDL.desktop ./
 cp -v  ~/ppsspp/icons/hicolor/256x256/apps/ppsspp.png ./
 cp -v  ~/ppsspp/icons/hicolor/256x256/apps/ppsspp.png ./.DirIcon
 

From e47b2913103707c3c5e05f80feca407d81fd8b7b Mon Sep 17 00:00:00 2001
From: Samuel <36420837+Samueru-sama@users.noreply.github.com>
Date: Sun, 18 May 2025 14:55:56 -0400
Subject: [PATCH 06/12] use relative paths

---
 scripts/makeappimage_64-bit.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/makeappimage_64-bit.sh b/scripts/makeappimage_64-bit.sh
index 24f3155c5e..c84557154e 100644
--- a/scripts/makeappimage_64-bit.sh
+++ b/scripts/makeappimage_64-bit.sh
@@ -15,9 +15,9 @@ fi
 mkdir -p ./AppDir/bin
 cd ./AppDir
 
-cp -v  ~/ppsspp/SDL/PPSSPPSDL.desktop ./
-cp -v  ~/ppsspp/icons/hicolor/256x256/apps/ppsspp.png ./
-cp -v  ~/ppsspp/icons/hicolor/256x256/apps/ppsspp.png ./.DirIcon
+cp -v  ../SDL/PPSSPPSDL.desktop ./
+cp -v  ../icons/hicolor/256x256/apps/ppsspp.png ./
+cp -v  ../icons/hicolor/256x256/apps/ppsspp.png ./.DirIcon
 
 # ADD LIBRARIES
 wget "$LIB4BN" -O ./lib4bin
@@ -34,7 +34,7 @@ xvfb-run -a -- ./lib4bin -p -v -e -s -k \
 	"$SYS_LIB_DIR"/spa-0.2/*/*
 
 # copy assets dir needs to be next oteh binary
-cp -vr ~/ppsspp/build/assets ./AppDir/bin
+cp -vr ../build/assets ./AppDir/bin
 
 # Prepare sharun
 echo "Preparing sharun..."

From a1a1633b72b0451c8878d20eba3ef0515241964e Mon Sep 17 00:00:00 2001
From: Samuel <36420837+Samueru-sama@users.noreply.github.com>
Date: Mon, 19 May 2025 01:18:21 -0400
Subject: [PATCH 07/12] `set -e`, fix blunder with `cp`

---
 scripts/makeappimage_64-bit.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/scripts/makeappimage_64-bit.sh b/scripts/makeappimage_64-bit.sh
index c84557154e..baf417e2eb 100644
--- a/scripts/makeappimage_64-bit.sh
+++ b/scripts/makeappimage_64-bit.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 ARCH="$(uname -m)"
 LIB4BN="https://raw.githubusercontent.com/VHSgunzo/sharun/refs/heads/main/lib4bin"
 URUNTIME="https://github.com/VHSgunzo/uruntime/releases/latest/download/uruntime-appimage-dwarfs-$ARCH"
@@ -23,7 +25,7 @@ cp -v  ../icons/hicolor/256x256/apps/ppsspp.png ./.DirIcon
 wget "$LIB4BN" -O ./lib4bin
 chmod +x ./lib4bin
 xvfb-run -a -- ./lib4bin -p -v -e -s -k \
-	~/ppsspp/build/PPSSPPSDL \
+	../build/PPSSPPSDL \
 	"$SYS_LIB_DIR"/libSDL* \
 	"$SYS_LIB_DIR"/lib*GL* \
 	"$SYS_LIB_DIR"/libvulkan* \
@@ -34,7 +36,7 @@ xvfb-run -a -- ./lib4bin -p -v -e -s -k \
 	"$SYS_LIB_DIR"/spa-0.2/*/*
 
 # copy assets dir needs to be next oteh binary
-cp -vr ../build/assets ./AppDir/bin
+cp -vr ../build/assets ./bin
 
 # Prepare sharun
 echo "Preparing sharun..."

From 0b2c231fec7d87204e720826e262dc818f513cc9 Mon Sep 17 00:00:00 2001
From: Samuel <36420837+Samueru-sama@users.noreply.github.com>
Date: Mon, 19 May 2025 02:07:14 -0400
Subject: [PATCH 08/12] `set -x`, lower dwarfs block size

---
 scripts/makeappimage_64-bit.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/makeappimage_64-bit.sh b/scripts/makeappimage_64-bit.sh
index baf417e2eb..1a5449dd40 100644
--- a/scripts/makeappimage_64-bit.sh
+++ b/scripts/makeappimage_64-bit.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-set -e
+set -ex
 
 ARCH="$(uname -m)"
 LIB4BN="https://raw.githubusercontent.com/VHSgunzo/sharun/refs/heads/main/lib4bin"
@@ -56,7 +56,7 @@ echo "Generating AppImage..."
 ./uruntime --appimage-mkdwarfs -f \
 	--set-owner 0 --set-group 0 \
 	--no-history --no-create-timestamp \
-	--compression zstd:level=22 -S26 -B8 \
+	--compression zstd:level=22 -S25 -B8 \
 	--header uruntime \
 	-i ./AppDir -o PPSSPP-"$VERSION"-anylinux-"$ARCH".AppImage
 

From 68677992d4dd16d36420503a2b13550da7c7c23b Mon Sep 17 00:00:00 2001
From: Samuel <36420837+Samueru-sama@users.noreply.github.com>
Date: Tue, 20 May 2025 11:32:52 -0400
Subject: [PATCH 09/12] limit `mkdwarfs` workers to 1

---
 scripts/makeappimage_64-bit.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/makeappimage_64-bit.sh b/scripts/makeappimage_64-bit.sh
index 1a5449dd40..9998070b29 100644
--- a/scripts/makeappimage_64-bit.sh
+++ b/scripts/makeappimage_64-bit.sh
@@ -57,6 +57,7 @@ echo "Generating AppImage..."
 	--set-owner 0 --set-group 0 \
 	--no-history --no-create-timestamp \
 	--compression zstd:level=22 -S25 -B8 \
+	--num-workers=1 \
 	--header uruntime \
 	-i ./AppDir -o PPSSPP-"$VERSION"-anylinux-"$ARCH".AppImage
 

From be2694451a59fb0b8c568509968455b4d68c66c7 Mon Sep 17 00:00:00 2001
From: Samuel <36420837+Samueru-sama@users.noreply.github.com>
Date: Thu, 22 May 2025 01:44:18 -0400
Subject: [PATCH 10/12] =?UTF-8?q?switch=20to=20appimagetool=20(squashfs)?=
 =?UTF-8?q?=20temporarily=E2=84=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scripts/makeappimage_64-bit.sh | 26 ++++++--------------------
 1 file changed, 6 insertions(+), 20 deletions(-)

diff --git a/scripts/makeappimage_64-bit.sh b/scripts/makeappimage_64-bit.sh
index 9998070b29..2691ebef8e 100644
--- a/scripts/makeappimage_64-bit.sh
+++ b/scripts/makeappimage_64-bit.sh
@@ -2,11 +2,11 @@
 
 set -ex
 
-ARCH="$(uname -m)"
+export ARCH="$(uname -m)"
 LIB4BN="https://raw.githubusercontent.com/VHSgunzo/sharun/refs/heads/main/lib4bin"
-URUNTIME="https://github.com/VHSgunzo/uruntime/releases/latest/download/uruntime-appimage-dwarfs-$ARCH"
+APPIMAGETOOL="https://github.com/pkgforge-dev/appimagetool-uruntime/releases/download/continuous/appimagetool-$ARCH.AppImage"
 UPINFO="gh-releases-zsync|$(echo "$GITHUB_REPOSITORY" | tr '/' '|')|latest|*$ARCH.AppImage.zsync"
-VERSION=test
+export VERSION=test
 
 SYS_LIB_DIR="/usr/lib"
 if [ -d /usr/lib/"$ARCH"-linux-gnu ]; then
@@ -45,23 +45,9 @@ ln -s ./bin/PPSSPPSDL ./AppRun
 
 # Make AppImage with uruntime
 cd ..
-wget "$URUNTIME" -O ./uruntime
-chmod +x ./uruntime
+wget "$APPIMAGETOOL" -O ./appimagetool
+chmod +x ./appimagetool
 
-#Add udpate info to runtime
-echo "Adding update information \"$UPINFO\" to runtime..."
-./uruntime --appimage-addupdinfo "$UPINFO"
-
-echo "Generating AppImage..."
-./uruntime --appimage-mkdwarfs -f \
-	--set-owner 0 --set-group 0 \
-	--no-history --no-create-timestamp \
-	--compression zstd:level=22 -S25 -B8 \
-	--num-workers=1 \
-	--header uruntime \
-	-i ./AppDir -o PPSSPP-"$VERSION"-anylinux-"$ARCH".AppImage
-
-echo "Generating zsync file..."
-zsyncmake ./*.AppImage -u ./*.AppImage
+./appimagetool -n -u "$UPINFO" ./AppDir
 
 echo "All Done!"

From 26021028c5d93578074f88c1e4ca3703c8764a90 Mon Sep 17 00:00:00 2001
From: Samuel <36420837+Samueru-sama@users.noreply.github.com>
Date: Thu, 22 May 2025 19:23:21 -0400
Subject: [PATCH 11/12] switch back to uruntime -S26, fix typo

---
 scripts/makeappimage_64-bit.sh | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/scripts/makeappimage_64-bit.sh b/scripts/makeappimage_64-bit.sh
index 2691ebef8e..fe787719fc 100644
--- a/scripts/makeappimage_64-bit.sh
+++ b/scripts/makeappimage_64-bit.sh
@@ -2,11 +2,11 @@
 
 set -ex
 
-export ARCH="$(uname -m)"
+ARCH="$(uname -m)"
 LIB4BN="https://raw.githubusercontent.com/VHSgunzo/sharun/refs/heads/main/lib4bin"
-APPIMAGETOOL="https://github.com/pkgforge-dev/appimagetool-uruntime/releases/download/continuous/appimagetool-$ARCH.AppImage"
+URUNTIME="https://github.com/VHSgunzo/uruntime/releases/latest/download/uruntime-appimage-dwarfs-$ARCH"
 UPINFO="gh-releases-zsync|$(echo "$GITHUB_REPOSITORY" | tr '/' '|')|latest|*$ARCH.AppImage.zsync"
-export VERSION=test
+VERSION=test
 
 SYS_LIB_DIR="/usr/lib"
 if [ -d /usr/lib/"$ARCH"-linux-gnu ]; then
@@ -35,7 +35,7 @@ xvfb-run -a -- ./lib4bin -p -v -e -s -k \
 	"$SYS_LIB_DIR"/pipewire-0.3/* \
 	"$SYS_LIB_DIR"/spa-0.2/*/*
 
-# copy assets dir needs to be next oteh binary
+# copy assets dir needs to be next to the binary
 cp -vr ../build/assets ./bin
 
 # Prepare sharun
@@ -45,9 +45,22 @@ ln -s ./bin/PPSSPPSDL ./AppRun
 
 # Make AppImage with uruntime
 cd ..
-wget "$APPIMAGETOOL" -O ./appimagetool
-chmod +x ./appimagetool
+wget "$URUNTIME" -O ./uruntime
+chmod +x ./uruntime
 
-./appimagetool -n -u "$UPINFO" ./AppDir
+#Add udpate info to runtime
+echo "Adding update information \"$UPINFO\" to runtime..."
+./uruntime --appimage-addupdinfo "$UPINFO"
+
+echo "Generating AppImage..."
+./uruntime --appimage-mkdwarfs -f \
+	--set-owner 0 --set-group 0 \
+	--no-history --no-create-timestamp \
+	--compression zstd:level=22 -S26 -B8 \
+	--header uruntime \
+	-i ./AppDir -o PPSSPP-"$VERSION"-anylinux-"$ARCH".AppImage
+
+echo "Generating zsync file..."
+zsyncmake ./*.AppImage -u ./*.AppImage
 
 echo "All Done!"

From 59b2966e9cbc747d870d5853b09f7b418be96fea Mon Sep 17 00:00:00 2001
From: Samuel <36420837+Samueru-sama@users.noreply.github.com>
Date: Fri, 23 May 2025 10:35:33 -0400
Subject: [PATCH 12/12] narrow down globbing

---
 scripts/makeappimage_64-bit.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/makeappimage_64-bit.sh b/scripts/makeappimage_64-bit.sh
index fe787719fc..0ecd31e54f 100644
--- a/scripts/makeappimage_64-bit.sh
+++ b/scripts/makeappimage_64-bit.sh
@@ -27,7 +27,8 @@ chmod +x ./lib4bin
 xvfb-run -a -- ./lib4bin -p -v -e -s -k \
 	../build/PPSSPPSDL \
 	"$SYS_LIB_DIR"/libSDL* \
-	"$SYS_LIB_DIR"/lib*GL* \
+	"$SYS_LIB_DIR"/libEGL* \
+	"$SYS_LIB_DIR"/libGL* \
 	"$SYS_LIB_DIR"/libvulkan* \
 	"$SYS_LIB_DIR"/dri/* \
 	"$SYS_LIB_DIR"/libXss.so* \