trial 'n error

Author: Sheathed

.github/workflows/main.yml

@@ -112,6 +112,49 @@ jobs:
       - name: Build and release
         run: fastforge release --name linux
 
+      - name: Replace AppRun
+        run: |
+          # Find the AppImage file
+          APPIMAGE_FILE=$(find dist -name "*.AppImage" -type f | head -1)
+          if [ -z "$APPIMAGE_FILE" ]; then
+            echo "No AppImage found, skipping AppRun replacement"
+            exit 0
+          fi
+          
+          # Convert to absolute path
+          APPIMAGE_FILE="$(cd "$(dirname "$APPIMAGE_FILE")" && pwd)/$(basename "$APPIMAGE_FILE")"
+          echo "Found AppImage: $APPIMAGE_FILE"
+          
+          # Make AppImage executable
+          chmod +x "$APPIMAGE_FILE"
+          
+          # Extract the AppImage
+          APPIMAGE_DIR=$(mktemp -d)
+          echo "Extracting to: $APPIMAGE_DIR"
+          cd "$APPIMAGE_DIR"
+          "$APPIMAGE_FILE" --appimage-extract
+          
+          # Check if extraction was successful
+          if [ ! -d squashfs-root ]; then
+            echo "Error: AppImage extraction failed"
+            exit 1
+          fi
+          
+          # Replace the AppRun script with our distro-agnostic version
+          if [ -f squashfs-root/AppRun ]; then
+            cp "$GITHUB_WORKSPACE/linux/packaging/appimage/AppRun" squashfs-root/AppRun
+            chmod +x squashfs-root/AppRun
+            echo "Replaced AppRun script"
+          else
+            echo "Warning: AppRun not found in extracted AppImage"
+          fi
+          
+          # Rebuild the AppImage
+          cd "$GITHUB_WORKSPACE"
+          appimagetool -n "$APPIMAGE_DIR/squashfs-root" "$APPIMAGE_FILE"
+          rm -rf "$APPIMAGE_DIR"
+          echo "AppImage rebuilt with custom AppRun"
+
       - name: Upload build artifacts
         uses: actions/upload-artifact@v4
         with:

linux/packaging/appimage/AppRun

@@ -0,0 +1,58 @@
+#!/bin/bash
+set -e
+
+# Get the directory where this script is located (the AppImage root)
+APPDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+# Export library path to include bundled libraries
+export LD_LIBRARY_PATH="${APPDIR}/lib:${LD_LIBRARY_PATH}"
+
+# Try to find the dynamic linker in common locations
+find_ld_linux() {
+    local ld_name="ld-linux-x86-64.so.2"
+    
+    # Check common locations in order of preference
+    for path in \
+        "/lib64/${ld_name}" \
+        "/lib/${ld_name}" \
+        "/lib/x86_64-linux-gnu/${ld_name}" \
+        "/usr/lib64/${ld_name}" \
+        "/usr/lib/${ld_name}"; do
+        if [ -f "$path" ]; then
+            echo "$path"
+            return 0
+        fi
+    done
+    
+    # If not found in standard locations, try using ldd to find it
+    if command -v ldd &> /dev/null; then
+        local ldd_output=$(ldd /bin/bash 2>/dev/null | grep "ld-linux" | awk '{print $1}')
+        if [ -n "$ldd_output" ] && [ -f "$ldd_output" ]; then
+            echo "$ldd_output"
+            return 0
+        fi
+    fi
+    
+    # If still not found, try using ldconfig
+    if command -v ldconfig &> /dev/null; then
+        local ldconfig_output=$(ldconfig -p 2>/dev/null | grep "ld-linux-x86-64.so.2" | awk '{print $NF}')
+        if [ -n "$ldconfig_output" ] && [ -f "$ldconfig_output" ]; then
+            echo "$ldconfig_output"
+            return 0
+        fi
+    fi
+    
+    return 1
+}
+
+# Get the path to the dynamic linker
+LD_LINUX=$(find_ld_linux)
+
+if [ -z "$LD_LINUX" ]; then
+    echo "Error: Could not find dynamic linker (ld-linux-x86-64.so.2)" >&2
+    echo "Tried common locations: /lib64, /lib, /lib/x86_64-linux-gnu, /usr/lib64, /usr/lib" >&2
+    exit 1
+fi
+
+# Execute the Saturn binary with the found dynamic linker
+exec "$LD_LINUX" --library-path "${APPDIR}/lib:${LD_LIBRARY_PATH}" "${APPDIR}/Saturn" "$@"