package test

4 files changed, 56 insertions, 40 deletions

diff --git a/Albion-Online.patch b/Albion-Online.patch
new file mode 100644
index 000000000000..0ae43b444a11
--- /dev/null
+++ b/Albion-Online.patch
@@ -0,0 +1,34 @@
+--- old	2022-09-11 19:50:08.965753712 -0600
++++ Albion-Online	2022-09-11 19:47:06.444974351 -0600
+@@ -1,16 +1,21 @@
+ #!/bin/sh
+ SCRIPT=$(readlink -f "$0")
+ SCRIPTPATH=$(dirname "$SCRIPT")
+-export QT_QPA_PLATFORM_PLUGIN_PATH="$SCRIPTPATH/launcher/plugins/platforms"
+-export QT_PLUGIN_PATH="$SCRIPTPATH/launcher/plugins/"
+-OSNAME=$(grep '^NAME=' /etc/os-release)
+-
+-if [ $OSNAME != "NAME=\"SteamOS\"" ]; then
+ export LIBGL_ALWAYS_SOFTWARE=1
+ export QSG_INFO=1
+-"$SCRIPTPATH/launcher/Albion-Online" "--no-sandbox" "-loglevel 0" "$@" &
+-else
+-export QT_QPA_PLATFORM="xcb;eglfs"
+-export __GL_GlslUseCollapsedArrays=0
+-"$SCRIPTPATH/launcher/Albion-Online" "--no-sandbox" "$@" &
++"$SCRIPTPATH/launcher/Albion-Online" "--no-sandbox" "-loglevel 0" "$@"
++
++declare exit_code=$?
++
++## Clear cache on core dump
++if (( $exit_code )); then
++    echo "Bad exit code: $exit_code"
++    if (( $exit_code >= 128 )); then ## Core Dump
++	echo "Core Dump can be produced by corrupt cache"
++	echo "Clearing user cache, you could try again"
++	rm -rf "$HOME/.config/Sandbox Interactive GmbH"
++	rm -rf "$HOME/.config/unity3d/Sandbox Interactive GmbH"
++	rm -rf "$HOME/.local/share/Sandbox Interactive GmbH/Albion Online Launcher"
++    fi
+ fi
++
diff --git a/PKGBUILD b/PKGBUILD
index 8e806f0ebd2e..69ae84f27334 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,68 +1,53 @@
-# Maintainer: Grey Christoforo <first name [at] last name [dot] net>
+# Submitter: Grey Christoforo <first name [at] last name [dot] net>
+# Maintainer: Jeancarlo Hidalgo <jeancahu@gmail.com>
 
 pkgname=albion-online-launcher-bin
-pkgver=1.16
+pkgver=1.17
 pkgrel=2
 pkgdesc="The first true cross-platform Sandbox MMO -- launcher client"
 url="https://albiononline.com/"
 arch=('x86_64')
 license=('custom')
-makedepends=('chrpath')
+makedepends=()
 depends=('libgl' 'qt5-webengine' 'sndio' 'xdelta3' 'ttf-font')
-optdepends=(albion-online-live-game-data-bin albion-online-staging-game-data-bin)
-source=("https://live.albiononline.com/clients/20210419110001/albion-online-setup"
-	"albion-online-launcher.desktop" "albion-online")
+optdepends=()
+source=("https://live.albiononline.com/clients/20220825102752/albion-online-setup"
+	"albion-online-launcher.desktop" "albion-online" "Albion-Online.patch")
 install=albion-online-launcher-bin.install
 options=(!strip docs libtool emptydirs !zipman staticlibs)
-sha256sums=('e220437b7a943769af42196ed23df2e6652b147f2eb78f6ad8f60a0c0028b078'
-            '4d94016e053c4d670c88631cbeb89442b1d0447265a2993e44337037288143c2'
-            '5127e055b747d3deb0a8563daeeb3dfacd123c108e027d286759e0ea3938a17e')
+sha256sums=('89f4b80b77984cc304b4af6a6b8bdea95dcf3395521cda160ed22c947c19e006'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+           )
 
 prepare() {
-  chrpath -d "${srcdir}/data/launcher/Albion-Online"
-
   pushd "${srcdir}/data/launcher"
   rm libQt5* qt.conf xdelta3 QtWebEngineProcess libicu*
   popd
 
   pushd "${srcdir}/data"
-  sed -i '/export LD_LIBRARY_PATH=.*/d' Albion-Online
-  sed -i '/export QT_QPA_PLATFORM_PLUGIN_PATH=.*/d' Albion-Online
-  sed -i '/export QT_PLUGIN_PATH=.*/d' Albion-Online
-
-  #sed -i 's,export LD_LIBRARY_PATH=.*,export LD_LIBRARY_PATH=/usr/lib,g' Albion-Online
-  #sed -i 's,export QT_QPA_PLATFORM_PLUGIN_PATH=.*,export QT_QPA_PLATFORM_PLUGIN_PATH=/usr/lib/qt/plugins/platforms,g' Albion-Online
-  #sed -i 's,export QT_PLUGIN_PATH=.*,export QT_PLUGIN_PATH=/usr/lib/qt/plugins,g' Albion-Online
-  #sed -i 's,.*launcher/Albion-Online",QT_AUTO_SCREEN_SCALE_FACTOR=0 LD_PRELOAD=/opt/albion-online-launcher-bin/game_x64/Albion-Online_Data/Plugins/x86_64/libSDL2-2.0.so.0 LD_PRELOAD=/usr/lib/libsndio.so "$SCRIPTPATH/launcher/Albion-Online",g' Albion-Online
-  sed -i 's,.*launcher/Albion-Online",sed -i -e "/Screenmanager Resolution Height/d" "$HOME/.config/unity3d/Sandbox Interactive GmbH/Albion Online Client/prefs"\nsed -i -e "/Screenmanager Resolution Width/d" "$HOME/.config/unity3d/Sandbox Interactive GmbH/Albion Online Client/prefs"\nQT_AUTO_SCREEN_SCALE_FACTOR=0 LD_PRELOAD=/opt/albion-online-launcher-bin/game_x64/Albion-Online_Data/Plugins/x86_64/libSDL2-2.0.so.0 "$SCRIPTPATH/launcher/Albion-Online",g' Albion-Online
+  patch Albion-Online < "${srcdir}/Albion-Online.patch"
   popd
 }
 
 package() {
   mkdir -p "${pkgdir}/opt"
   cp -a "${srcdir}/data" "${pkgdir}/opt/${pkgname}"
-  chmod 777 $pkgdir/opt
+  chmod 777 "$pkgdir/opt/${pkgname}"
 
-  mkdir "${pkgdir}/opt/${pkgname}/staging_x64"
-  chmod 775 "${pkgdir}/opt/${pkgname}/staging_x64"
   mkdir -p "${pkgdir}/opt/${pkgname}/game_x64"
+  chmod 6777 "${pkgdir}/opt/${pkgname}/game_x64"
 
-  chmod 775 "${pkgdir}/opt/${pkgname}/launcher"
-
-  # make the game think it's using the right version of libsndio
-  mkdir -p "${pkgdir}/usr/lib"
-  ln -s /usr/lib/libsndio.so "${pkgdir}/usr/lib/libsndio.so.6.1"
-  
-  # link launcher launcher
+  # Link launcher to usr/system binaries directory
   mkdir -p "${pkgdir}/usr/bin"
   install -m755 -D "${srcdir}/albion-online" "${pkgdir}/usr/bin"
 
-  # install .desktop file
+  # Install .desktop file
   install -m755 -D "${srcdir}/albion-online-launcher.desktop" -t "${pkgdir}/usr/share/applications"
 
-  # put the EULA somewhere
+  # Move EULA to /usr/share licenses path
   install -Dm644 "${srcdir}/data/eula.txt" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
 # vim:set ts=2 sw=2 et:
-
diff --git a/albion-online b/albion-online
index 9b196d5f2f31..f394c99a64bd 100644..100755
--- a/albion-online
+++ b/albion-online
@@ -1,8 +1,2 @@
 #!/bin/bash
-if [ -d "/opt/albion-online-launcher-bin/game_x64/Albion-Online_Data" ];
-then
 	/opt/albion-online-launcher-bin/Albion-Online
-else
-	pkexec chown $USER /opt/albion-online-launcher-bin/game_x64
-	/opt/albion-online-launcher-bin/Albion-Online
-fi 
diff --git a/albion-online-launcher-bin.install b/albion-online-launcher-bin.install
index 735751c08d4d..c2fa2b8285bd 100644
--- a/albion-online-launcher-bin.install
+++ b/albion-online-launcher-bin.install
@@ -12,5 +12,8 @@ post_upgrade() {
 EOM
   chgrp -R albion "/opt/albion-online-launcher-bin/launcher"
   chgrp -R albion "/opt/albion-online-launcher-bin/game_x64"
-  chgrp -R albion "/opt/albion-online-launcher-bin/staging_x64"
+}
+
+post_remove() {
+  groupdel albion &> /dev/null
 }