Simplify deployment with anylinux wrapper scripts, add option to self update appimage (#15)

* simplify deployment using wrapper scripts

* add retries for git clone librashader

* Update get-dependencies.sh

* aur is down lmao

* fix `aarch64` failing

* simplify deps install

Author: Samueru-sama

ares-appimage.sh

@@ -3,29 +3,24 @@
 set -ex
 ARCH="$(uname -m)"
 REPO="https://github.com/ares-emulator/ares"
-SHARUN="https://github.com/VHSgunzo/sharun/releases/latest/download/sharun-$ARCH-aio"
 GRON="https://raw.githubusercontent.com/xonixx/gron.awk/refs/heads/main/gron.awk"
-URUNTIME="https://github.com/VHSgunzo/uruntime/releases/latest/download/uruntime-appimage-dwarfs-$ARCH"
-URUNTIME_LITE="https://github.com/VHSgunzo/uruntime/releases/latest/download/uruntime-appimage-dwarfs-lite-$ARCH"
 
 # Determine to build nightly or stable
 if [ "$1" = 'devel' ]; then
 	echo "Making nightly build of ares..."
-	UPINFO="gh-releases-zsync|$(echo "$GITHUB_REPOSITORY" | tr '/' '|')|nightly|*$ARCH.AppImage.zsync"
+	export UPINFO="gh-releases-zsync|${GITHUB_REPOSITORY%/*}|${GITHUB_REPOSITORY#*/}|nightly|*$ARCH.AppImage.zsync"
 	VERSION="$(git ls-remote "$REPO" HEAD | cut -c 1-9)"
 	git clone "$REPO"
 else
 	echo "Making stable build of ares..."
-	UPINFO="gh-releases-zsync|$(echo "$GITHUB_REPOSITORY" | tr '/' '|')|latest|*$ARCH.AppImage.zsync"
+	export UPINFO="gh-releases-zsync|${GITHUB_REPOSITORY%/*}|${GITHUB_REPOSITORY#*/}|latest|*$ARCH.AppImage.zsync"
 	wget "$GRON" -O ./gron.awk
 	chmod +x ./gron.awk
 	VERSION=$(wget https://api.github.com/repos/ares-emulator/ares/tags -O - \
 		| ./gron.awk | awk -F'=|"' '/name/ {print $3; exit}')
 	git clone --branch "$VERSION" --single-branch "$REPO" ./ares
 fi
 
-echo "$VERSION" > ~/version
-
 # BUILD ARES
 (
 	cd ./ares
@@ -50,59 +45,33 @@ echo "$VERSION" > ~/version
  	ccache -s -v
 )
 rm -rf ./ares
+[ -n "$VERSION" ] && echo "$VERSION" > ~/version
 
 # NOW MAKE APPIMAGE
-mkdir -p ./AppDir/share && (
-	cd ./AppDir
-	cp -rv /usr/share/ares                                ./share
-	cp -v /usr/share/applications/ares.desktop            ./ares.desktop
-	cp -v /usr/share/icons/hicolor/256x256/apps/ares.png  ./ares.png
-	cp -v /usr/share/icons/hicolor/256x256/apps/ares.png  ./.DirIcon
-	
-	wget --retry-connrefused --tries=30 "$SHARUN" -O ./sharun-aio
-	chmod +x ./sharun-aio
-	xvfb-run -a -- \
-		./sharun-aio l -p -v -e -s -k \
-		/usr/bin/ares                 \
-		/usr/bin/sourcery             \
-		/usr/lib/lib*GL*.so*          \
-		/usr/lib/dri/*                \
-		/usr/lib/libXss.so*           \
-		/usr/lib/gtk-3*/*/*           \
-		/usr/lib/gio/modules/*        \
-		/usr/lib/gdk-pixbuf-*/*/*/*   \
-		/usr/lib/alsa-lib/*           \
-		/usr/lib/pulseaudio/*         \
-		/usr/lib/pipewire-0.3/*       \
-		/usr/lib/spa-0.2/*/* || true # nobody saw a thing ok?
-	rm -f ./sharun-aio
-	
-	# Prepare sharun
-	ln ./sharun ./AppRun
-	./sharun -g
-)
+URUNTIME="https://raw.githubusercontent.com/pkgforge-dev/Anylinux-AppImages/refs/heads/main/useful-tools/uruntime2appimage.sh"
+SHARUN="https://raw.githubusercontent.com/pkgforge-dev/Anylinux-AppImages/refs/heads/main/useful-tools/quick-sharun.sh"
 
-# turn appdir into appimage
-wget --retry-connrefused --tries=30 "$URUNTIME"      -O  ./uruntime
-wget --retry-connrefused --tries=30 "$URUNTIME_LITE" -O  ./uruntime-lite
-chmod +x ./uruntime*
+export ADD_HOOKS="self-updater.bg.hook"
+export OUTNAME=ares-"$VERSION"-anylinux-"$ARCH".AppImage
+export DESKTOP=/usr/share/applications/ares.desktop
+export ICON=/usr/share/icons/hicolor/256x256/apps/ares.png
+export DEPLOY_OPENGL=1 
+export DEPLOY_PIPEWIRE=1
 
-#Add udpate info to runtime
-echo "Adding update information \"$UPINFO\" to runtime..."
-./uruntime-lite --appimage-addupdinfo "$UPINFO"
+# "fix" xvfb-run failing to kill the process in aarch64
+if [ "$ARCH" = "aarch64" ]; then
+	sed -i 's#kill $XVFBPID#kill $XVFBPID || true#' "$(command -v xvfb-run)"
+fi
 
-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-lite               \
-	-i ./AppDir                          \
-	-o ./ares-"$VERSION"-anylinux-"$ARCH".AppImage
+# ADD LIBRARIES
+wget --retry-connrefused --tries=30 "$SHARUN" -O ./quick-sharun
+chmod +x ./quick-sharun
+./quick-sharun /usr/bin/ares /usr/bin/sourcery
 
-echo "Generating zsync file..."
-zsyncmake ./*.AppImage -u ./*.AppImage
+# turn appdir into appimage
+wget --retry-connrefused --tries=30 "$URUNTIME" -O ./uruntime2appimage
+chmod +x ./uruntime2appimage
+./uruntime2appimage
 
 mkdir -p ./dist
 mv -v ./*.AppImage* ./dist

get-dependencies.sh

@@ -1,29 +1,25 @@
 #!/bin/sh
 
 set -ex
-ARCH="$(uname -m)"
+EXTRA_PACKAGES="https://raw.githubusercontent.com/pkgforge-dev/Anylinux-AppImages/refs/heads/main/useful-tools/get-debloated-pkgs.sh"
 
 echo "Installing dependencies..."
 echo "---------------------------------------------------------------"
 pacman -Syu --noconfirm \
-	alsa-lib           \
 	base-devel         \
 	cmake              \
 	ccache             \
 	curl               \
 	gcc-libs           \
 	git                \
-	glibc              \
 	gtk3               \
-	hicolor-icon-theme \
 	libao              \
 	libdecor           \
 	libpulse           \
 	libretro-shaders   \
 	libx11             \
 	libxrandr          \
 	libxss             \
-	mesa               \
 	ninja              \
 	openal             \
 	pipewire-audio     \
@@ -33,31 +29,17 @@ pacman -Syu --noconfirm \
 	rust               \
 	sdl2               \
 	sdl3               \
-	vulkan-driver      \
-	vulkan-icd-loader  \
 	wget               \
 	xorg-server-xvfb   \
 	zlib               \
 	zsync
 
-case "$ARCH" in
-	'x86_64')  PKG_TYPE='x86_64.pkg.tar.zst';;
-	'aarch64') PKG_TYPE='aarch64.pkg.tar.xz';;
-	''|*) echo "Unknown arch: $ARCH"; exit 1;;
-esac
 
-LLVM_URL="https://github.com/pkgforge-dev/llvm-libs-debloated/releases/download/continuous/llvm-libs-mini-$PKG_TYPE"
-LIBXML_URL="https://github.com/pkgforge-dev/llvm-libs-debloated/releases/download/continuous/libxml2-iculess-$PKG_TYPE"
-OPUS_URL="https://github.com/pkgforge-dev/llvm-libs-debloated/releases/download/continuous/opus-nano-$PKG_TYPE"
-
-echo "Installing debloated pckages..."
+echo "Installing debloated packages..."
 echo "---------------------------------------------------------------"
-wget --retry-connrefused --tries=30 "$LLVM_URL" -O   ./llvm-libs.pkg.tar.zst
-wget --retry-connrefused --tries=30 "$LIBXML_URL" -O ./libxml2.pkg.tar.zst
-wget --retry-connrefused --tries=30 "$OPUS_URL" -O   ./opus-nano.pkg.tar.zst
-
-pacman -U --noconfirm ./*.pkg.tar.zst
-rm -f ./*.pkg.tar.zst
+wget --retry-connrefused --tries=30 "$EXTRA_PACKAGES" -O ./get-debloated-pkgs.sh
+chmod +x ./get-debloated-pkgs.sh
+./get-debloated-pkgs.sh --add-opengl gtk3-mini opus-mini libxml2-mini
 
 # Make librashader
 echo "Making extra dependencies..."
@@ -71,7 +53,7 @@ cat /etc/makepkg.conf
 git clone "https://aur.archlinux.org/librashader.git" ./librashader
 ( cd ./librashader
   export RUSTC_WRAPPER="sccache"
-  makepkg -f
+  makepkg -fs --noconfirm
   sccache --show-stats
   ls -la .
   pacman --noconfirm -U *.pkg.tar.*