diff --git a/com.jagexlauncher.JagexLauncher.yml b/com.jagexlauncher.JagexLauncher.yml index 8168751..e16c0b4 100644 --- a/com.jagexlauncher.JagexLauncher.yml +++ b/com.jagexlauncher.JagexLauncher.yml @@ -183,7 +183,6 @@ sdk-extensions: - org.freedesktop.Sdk.Compat.i386 - org.freedesktop.Sdk.Extension.toolchain-i386 - org.freedesktop.Sdk.Extension.openjdk11 - finish-args: - --allow=devel - --allow=multiarch @@ -233,6 +232,7 @@ finish-args: - --share=network - --talk-name=org.freedesktop.Notifications - --talk-name=org.kde.StatusNotifierWatcher + - --device=dri # Required for bwrap to work - --talk-name=org.freedesktop.portal.Background # --- Steam --- @@ -341,7 +341,15 @@ modules: - #!/bin/bash - set -x - - /app/jre/bin/java -Duser.home="$XDG_DATA_HOME/user_home" -jar /app/RuneLite.jar + - exec 3>&1 4>&2 + - trap 'exec 2>&4 1>&3' 0 1 2 3 + - exec 1>"log.out" 2>&1 + - ls /app + - pwd + - ls + - find / -name "java" + - echo "AHHHHH" + - /run/parent/app/jre/bin/java -Duser.home="$XDG_DATA_HOME/user_home" -jar /run/parent/app/RuneLite.jar -J-Duser.home="$XDG_DATA_HOME/user_home" - name: platform-bootstrap buildsystem: simple @@ -371,7 +379,31 @@ modules: /app/lib32 /app/lib/i386-linux-gnu /lib64 - - name: jagex-launcher + # - name: openssl + # buildsystem: simple + # build-commands: + # - ./config --prefix=/app --openssldir=/app/ssl shared zlib + # - make -j $FLATPAK_BUILDER_N_JOBS + # - make install_sw + # sources: + # - type: git + # url: https://github.com/openssl/openssl.git + # tag: OpenSSL_1_1_1w + # commit: e04bd3433fd84e1861bf258ea37928d9845e6a86 + # - name: proton-ge + # buildsystem: simple + # build-commands: + # - mkdir proton + # - tar xf proton.tar.xz -C proton --strip-components 1 # String top level dir and place into predictable directory name to decouple from the name of the top-level dir + # - install --directory /app/opt + # - chmod -R 755 proton + # - mv proton /app/opt/proton + # sources: + # - type: file + # dest-filename: proton.tar.xz + # url: https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton9-5/GE-Proton9-5.tar.gz + # sha512: a1ba336e1bb654c202e07cf4589d6b50f1457c196d56b1ecc2ff62ab08789aaef55fa7b498d5c3b51d4775aa2fd076bfbba4b8d40c67faa2d22433f9379144ee + - name: jagex-launcher buildsystem: simple build-commands: - mkdir -p /app/lib/i386-linux-gnu/GL diff --git a/scripts/jagex-run.sh b/scripts/jagex-run.sh index 994dad9..b9a50ca 100644 --- a/scripts/jagex-run.sh +++ b/scripts/jagex-run.sh @@ -16,12 +16,18 @@ if ! [ -f "$jagex_launcher_exe_path" ]; then # Copy steam deck properties file to a location accessible by the flatpak cp /app/steamdeck-settings.properties "$XDG_DATA_HOME/steamdeck-settings.properties" fi +mkdir -p "$wineprefix/drive_c/Program Files (x86)/Jagex Launcher/Games/RuneLite" +cp -r /app/RuneLite* "$wineprefix/drive_c/Program Files (x86)/Jagex Launcher/Games/RuneLite/" # Make sure the registry has the installation location for runelite. -WINEPREFIX="$wineprefix" GAMEID=asdf WINEDEBUG="-all" "umu-run" "$XDG_DATA_HOME"/prefix/drive_c/windows/syswow64/reg.exe add "HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Uninstall\RuneLite Launcher_is1" /v "InstallLocation" /t REG_SZ /d "Z:\app" /f +WINEPREFIX="$wineprefix" GAMEID=asdf "umu-run" "regedit.exe" -# Make sure the registry has the installation location for hdos -WINEPREFIX="$wineprefix" GAMEID=asdf WINEDEBUG="-all" "umu-run" "$XDG_DATA_HOME"/prefix/drive_c/windows/syswow64/reg.exe add "HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Uninstall\HDOS Launcher_is1" /v "InstallLocation" /t REG_SZ /d "Z:\app" /f +WINEPREFIX="$wineprefix" GAMEID=asdf "umu-run" "explorer.exe" + +WINEPREFIX="$wineprefix" GAMEID=asdf "umu-run" "reg.exe" add "HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Uninstall\RuneLite Launcher_is1" /v "InstallLocation" /t REG_SZ /d "C:\Program Files (x86)\Jagex Launcher\Games\RuneLite" /f + +# # Make sure the registry has the installation location for hdos +# WINEPREFIX="$wineprefix" GAMEID=asdf WINEDEBUG="-all" PROTONPATH="/app/opt/proton" "umu-run" "~/.local/share/flatpak/app/com.jagexlauncher.JagexLauncher/current/active/files/opt/proton/files/share/default_pfx/drive_c/windows/system32/reg.exe" add "HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Uninstall\HDOS Launcher_is1" /v "InstallLocation" /t REG_SZ /d "Z:\app" /f # Run with overrides for dxvk WINEPREFIX="$wineprefix" GAMEID=asdf "umu-run" "$jagex_launcher_exe_path"