set and use APPIMAGE_ARCH, remove AppRun-Qt (#76)

Author: Samueru-sama

useful-tools/bin/AppRun-Qt

@@ -12,11 +12,12 @@ fi
 set -e
 
 CURRENTDIR="$(cd "${0%/*}" && echo "$PWD")"
-PATH="$CURRENTDIR/bin:$PATH"
-export PATH
 BIN="${ARGV0:-$0}"
 BIN="${BIN##*/}"
 
+export APPIMAGE_ARCH=@@@@@
+export PATH="$CURRENTDIR/bin:$PATH"
+
 # get name of main binary from the .desktop file
 _get_main_bin_name() {
 	for f in "$CURRENTDIR"/*.desktop; do

useful-tools/bin/AppRun-generic

@@ -0,0 +1,16 @@
+#!/bin/sh
+
+# Normally we bundle qt6ct to allow custom theming so this hook is not needed
+# WARNING: The '-stylesheet' flag is NOT supported by all Qt apps!
+# So verify that it works before using this hook!
+
+# USAGE: Set the env variable APPIMAGE_QT_THEME
+# or make a .stylesheet file next to the appimage (appimagename + .stylesheet)
+
+# check if there is a custom stylesheet and append it to the arrray
+if [ -f "$APPIMAGE".stylesheet ]; then
+	APPIMAGE_QT_THEME="$APPIMAGE.stylesheet"
+fi
+if [ -f "$APPIMAGE_QT_THEME" ]; then
+	set -- "$@" "-stylesheet" "$APPIMAGE_QT_THEME"
+fi

useful-tools/hooks/qt-theme.src.hook

@@ -14,7 +14,6 @@
 
 set -e
 
-ARCH="$(uname -m)"
 APPDIR=${APPDIR:-$SHARUN_DIR}
 APPNAME=${APPIMAGE##*/}
 
@@ -34,7 +33,7 @@ UPDATE_MSG="${UPDATE_MSG:-A new version of $APPNAME is available. Do you wish to
 POST_UPDATE_GOOD="$APPNAME updated successfully!"
 POST_UPDATE_BAD="ERROR: Something went wrong updating $APPNAME"
 DO_NOT_ASK="Do you wish to disable update checking and not see this message again?"
-APPIMAGEUPDATETOOL_LINK="${APPIMAGEUPDATETOOL_LINK:-https://github.com/AppImageCommunity/AppImageUpdate/releases/download/continuous/appimageupdatetool-$ARCH.AppImage}"
+APPIMAGEUPDATETOOL_LINK="${APPIMAGEUPDATETOOL_LINK:-https://github.com/AppImageCommunity/AppImageUpdate/releases/download/continuous/appimageupdatetool-$APPIMAGE_ARCH.AppImage}"
 
 # make sure we can update the thing
 _sanity_check() {

useful-tools/hooks/self-updater.bg.hook

@@ -2,6 +2,12 @@
 
 # hook that checks several potential issues vulkan related
 
+# On aarch64 device drivers are all over the place and often they ship with
+# modifications not upstreamed to mesa, so we need to allow the host vulkan
+if [ "$APPIMAGE_ARCH" = 'aarch64' ]; then
+	export SHARUN_ALLOW_SYS_VKICD=1
+fi
+
 _err_msg(){
 	>&2 printf '\033[1;31m%s\033[0m\n' " $*"
 }
@@ -53,15 +59,15 @@ _check_vulkan_json_path() (
 	implicit_dir="$_VULKAN_HOOK_DIR"/vulkan/implicit_layer.d
 	explicit_dir="$_VULKAN_HOOK_DIR"/vulkan/explicit_layer.d
 
-	for dep in grep sed mkdir uname; do
+	for dep in grep sed mkdir; do
 		if ! command -v "$dep" 1>/dev/null; then
 			return 1
 		fi
 	done
 
 	for f in /usr/share/vulkan/explicit_layer.d/*; do
 		if [ -f "$f" ] && layer_path=$(grep -o '"/usr.*$LIB.*"' "$f"); then
-			for p in lib/"$(uname -m)"-linux-gnu lib64 lib; do
+			for p in lib/"$APPIMAGE_ARCH"-linux-gnu lib64 lib; do
 				test_path=$(echo "$layer_path" | sed "s|\"||g; s|\$LIB|$p|")
 				if [ -e "$test_path" ]; then
 					mkdir -p "$explicit_dir"
@@ -77,7 +83,7 @@ _check_vulkan_json_path() (
 
 	for f in /usr/share/vulkan/implicit_layer.d/*; do
 		if [ -f "$f" ] && layer_path=$(grep -o '"/usr.*$LIB.*"' "$f"); then
-			for p in lib/"$(uname -m)"-linux-gnu lib64 lib; do
+			for p in lib/"$APPIMAGE_ARCH"-linux-gnu lib64 lib; do
 				test_path=$(echo "$layer_path" | sed "s|\"||g; s|\$LIB|$p|")
 				if [ -e "$test_path" ]; then
 					mkdir -p "$implicit_dir"
@@ -95,3 +101,4 @@ _check_vulkan_json_path() (
 if _check_vulkan_json_path && [ -d "$_VULKAN_HOOK_DIR" ]; then
 	export XDG_CONFIG_DIRS="$_VULKAN_HOOK_DIR:${XDG_CONFIG_DIRS:-/etc/xdg}"
 fi
+

useful-tools/hooks/vulkan-check.src.hook

@@ -1042,6 +1042,8 @@ elif [ ! -f "$APPDIR"/AppRun ]; then
 	_echo "* Hardlinked $APPDIR/sharun as $APPDIR/AppRun..."
 fi
 
+sed -i -e "s|@@@@@|$ARCH|" "$APPDIR"/AppRun
+
 chmod +x "$APPDIR"/AppRun "$APPDIR"/bin/*.hook "$APPDIR"/bin/notify 2>/dev/null || :
 
 # make sure the .env has all the "unset" last, due to a bug in the dotenv