From 1dd4f50c20b63ff1cea178dbb667ba73539cec82 Mon Sep 17 00:00:00 2001 From: zer0def Date: Wed, 28 Apr 2021 15:04:53 +0200 Subject: [PATCH] Fix launch script pathing --- .SRCINFO | 6 +++--- PKGBUILD | 9 +++++---- open-hexagon | 3 ++- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 30978ba6..7bd2a382 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = open-hexagon-git pkgdesc = Free software clone of Super Hexagon - a music-based arcade game - pkgver = 2.0.preview.r2012.g439a97c2 + pkgver = 2.0.preview.r2013.gae57d179 pkgrel = 1 epoch = 1 url = https://openhexagon.org/ @@ -27,13 +27,13 @@ pkgbase = open-hexagon-git sha512sums = SKIP sha512sums = e062d52b3d12fba285e881175ec7c834b24e28b366a9a19d8dbdbe7b6ffae9462ab5d0f9f84119276a30f9c7b6f8745b00eb98c3e90e344a740824cec26505e9 sha512sums = b9b7124b16e3019dc36f3219107b7093ade9d88fa03c249575f2914d063df7f4311a390e78372cb741729db288d7cd74e5fc6e936277e619a1b3ed65f233891a - sha512sums = d7b40efb198233365f8ad92c14c04150eb064c212c04f77720843cbd0d89c4d80e3b6a513a4a04bcaa9e11f5308ea0a75bac63c8c4b9e269477e01c8a0080530 + sha512sums = cb0d2036b0e335590b92f3050f7388fe0cd0a21c99a844b9f394756418faa99025935f98cf0d9ae9526f9c668d8ec11df06140311998e4183c9cab6a14330e42 sha512sums = bc7d1e1a420a439283b4fcf2f06a8a50ca06d3934b79f6a93ff4ad4d269d6b246eb6a1824381c36bbb73fc7d24e9883281ab66eab05b2cc2fdbac3ed14a775d5 sha512sums = ed8beeffba0e1c4a31f84f5a503da7f50ba9bdb4a3bd7e3b0dc0e61a62a40511bba887232412cadd0ed02ea0d0424f12ed6b59c75d6bf9472a7d2c89f308c8f8 b2sums = SKIP b2sums = 7dfe5d5b32f35cd9572199bf2080ae4c3552fb5496836a139c90cb5bae7adb46545c0017fcb302409bc1babcc1f5f30a136e232983197c485ae1d65d3d8ce581 b2sums = 61dee7a9ea98ee85ad2ff98de4297c5fe74442f8b2c6f5108cef320649a92e6053cfc42568d2423e76b5671a2f4cb310e7f0c937e38ec4af8df1c2b9fde53e55 - b2sums = 7aab3f71132d7824eb1569d6c543027df6ea43311291e60a8d873b73a4e1abd34c127f17df47977d0bec8d9d3f8941911fbbf4e97ad0e7ba930a43008a074661 + b2sums = 48caba5cb79f819bacecedb93d8eb045dac8daceb6d83164958122828cf33ed4a4287d7d635c0f722f7d347f74c8b71fce334309c230688b85c465c76ccbfc2e b2sums = 2ea97df7c917222e6a13b778208e41401c7d29db7851b6252c2a7db3107adad7a3e939e27684352277971c1220f90243a6053580af21c960a041b84375e9a239 b2sums = aa51608e4796f8be19cea31135e8e240f8f9de962a7d77bc5dffd7beba5f87193a2f7c1a2df4a13de0fd7861170fc1e8f606b97ef7718e8d1aaf6e4cbfb9a8bc diff --git a/PKGBUILD b/PKGBUILD index 52d5b178..c2b93f2c 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Yurii pkgname=open-hexagon-git -pkgver=2.0.preview.r2012.g439a97c2 +pkgver=2.0.preview.r2013.gae57d179 pkgrel=1 epoch=1 pkgdesc='Free software clone of Super Hexagon - a music-based arcade game' @@ -30,7 +30,7 @@ sha512sums=( 'SKIP' e062d52b3d12fba285e881175ec7c834b24e28b366a9a19d8dbdbe7b6ffae9462ab5d0f9f84119276a30f9c7b6f8745b00eb98c3e90e344a740824cec26505e9 b9b7124b16e3019dc36f3219107b7093ade9d88fa03c249575f2914d063df7f4311a390e78372cb741729db288d7cd74e5fc6e936277e619a1b3ed65f233891a - d7b40efb198233365f8ad92c14c04150eb064c212c04f77720843cbd0d89c4d80e3b6a513a4a04bcaa9e11f5308ea0a75bac63c8c4b9e269477e01c8a0080530 + cb0d2036b0e335590b92f3050f7388fe0cd0a21c99a844b9f394756418faa99025935f98cf0d9ae9526f9c668d8ec11df06140311998e4183c9cab6a14330e42 bc7d1e1a420a439283b4fcf2f06a8a50ca06d3934b79f6a93ff4ad4d269d6b246eb6a1824381c36bbb73fc7d24e9883281ab66eab05b2cc2fdbac3ed14a775d5 ed8beeffba0e1c4a31f84f5a503da7f50ba9bdb4a3bd7e3b0dc0e61a62a40511bba887232412cadd0ed02ea0d0424f12ed6b59c75d6bf9472a7d2c89f308c8f8 ) @@ -38,7 +38,7 @@ b2sums=( 'SKIP' 7dfe5d5b32f35cd9572199bf2080ae4c3552fb5496836a139c90cb5bae7adb46545c0017fcb302409bc1babcc1f5f30a136e232983197c485ae1d65d3d8ce581 61dee7a9ea98ee85ad2ff98de4297c5fe74442f8b2c6f5108cef320649a92e6053cfc42568d2423e76b5671a2f4cb310e7f0c937e38ec4af8df1c2b9fde53e55 - 7aab3f71132d7824eb1569d6c543027df6ea43311291e60a8d873b73a4e1abd34c127f17df47977d0bec8d9d3f8941911fbbf4e97ad0e7ba930a43008a074661 + 48caba5cb79f819bacecedb93d8eb045dac8daceb6d83164958122828cf33ed4a4287d7d635c0f722f7d347f74c8b71fce334309c230688b85c465c76ccbfc2e 2ea97df7c917222e6a13b778208e41401c7d29db7851b6252c2a7db3107adad7a3e939e27684352277971c1220f90243a6053580af21c960a041b84375e9a239 aa51608e4796f8be19cea31135e8e240f8f9de962a7d77bc5dffd7beba5f87193a2f7c1a2df4a13de0fd7861170fc1e8f606b97ef7718e8d1aaf6e4cbfb9a8bc ) @@ -87,7 +87,8 @@ package() { cp "${srcdir}/${_reponame}/misc/default_config.json" "${pkgdir}/var/lib/open-hexagon/config.json" cd "${pkgdir}/usr/lib/open-hexagon" - ln -s "$(ls -1r /usr/lib/libluajit-*.so | head -n1)" libluajit.so + local LUAJIT_PATH="$(ls -1r /usr/lib/libluajit-*.so | head -n1)" + ln -s "${LUAJIT_PATH/\/usr\/lib\/libluajit/..\/libluajit}" libluajit.so for i in config.json default_config.json scores.json users.json log.txt Profiles Replays; do ln -sf "../../../var/lib/open-hexagon/${i}" done diff --git a/open-hexagon b/open-hexagon index 7b1a82d5..c72b48d6 100755 --- a/open-hexagon +++ b/open-hexagon @@ -1,8 +1,9 @@ #!/bin/sh +MYDIR="$(dirname "$(readlink -f "${0}")")" id -nG | grep -qE '[ ^]games[ $]' if [ "${?}" -ne 0 ]; then zenity --error --text="Your user must be in 'games' group." exit 1 fi -LD_LIBRARY_PATH="$(dirname "$(readlink -f "${0}")")/../lib/open-hexagon${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}" ../lib/open-hexagon/SSVOpenHexagon +LD_LIBRARY_PATH="${MYDIR}/../lib/open-hexagon${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}" "${MYDIR}/../lib/open-hexagon/SSVOpenHexagon"