diff options
-rw-r--r-- | .SRCINFO | 7 | ||||
-rw-r--r-- | PKGBUILD | 18 | ||||
-rw-r--r-- | heli-x-wrapper.sh | 4 |
3 files changed, 16 insertions, 13 deletions
@@ -1,13 +1,14 @@ pkgbase = heli-x pkgdesc = Professional R/C Flight Simulator pkgver = 10.0.2465 - pkgrel = 2 + pkgrel = 3 url = https://www.heli-x.info arch = i686 arch = x86_64 license = custom makedepends = icoutils - depends = java-runtime=11 + depends = archlinux-java-run + depends = java-runtime>=11 depends = hicolor-icon-theme options = !strip source = heli-x-10.0.2465.tar.gz::https://www.heli-x.info/2465/HELI-X10.tar.gz @@ -19,7 +20,7 @@ pkgbase = heli-x sha512sums = 22e2323e71396dc38d94142ef6235b1002fec094ab00fbdc5dae59fd5863c5692ab4c8491f21af7c0a48588c368d339d6019f0fe91ade57fa790b55d13ddcb87 sha512sums = b8d49650284a8b7b05bc65aaed1c2bc3219cfa448165fb90b5953e2ad92a716a7543d1fb9da258162bf3541e116a7d59fc9235fdada263e8b5ff878cc4a35f31 sha512sums = 32cca4e3a8fcdee8553931b82bf867bfdf20594b02cce8125ad8967ed56f5d10405490dc9c12f50a4a37f8c280f4dfd843a228e09cf7ec7250ae7724de207b5b - sha512sums = b834a975473b499b6924f0dd9b5ee6d463e94d2bc5232dd08e35b72bca0d862db44ca03bd64efee875e61f3b14162280f6daf79ed8c4c48a4e528e3e017cd33a + sha512sums = b6b318c787c45602f0f1cfe1e30edfc56a2fec4fd98d8add9715ef950a9355dee0f5267378a4f4aade487bb75e26150b87ece9481278dee8c20775ca01669a90 sha512sums = 36af9602ad6b4654dba7651851ee51acf062a76824dc584fbb2e836e1438199ae5ee187d76b5cb56d8c260bce7ecdefa67e973d003678c3ed3ad3c107fa9c09d sha512sums = 8be08b65cdc9007f4d39ab7a327a407bc7162d8d091d3e44294e11ddc6903151e35eb9999082332439b065ccac6ed6cb39bb2f0dae315483b00c9580e2184010 @@ -3,12 +3,12 @@ pkgname=heli-x pkgver=10.0.2465 -pkgrel=2 +pkgrel=3 pkgdesc="Professional R/C Flight Simulator" arch=('i686' 'x86_64') url="https://www.heli-x.info" license=('custom') -depends=('java-runtime=11' 'hicolor-icon-theme') +depends=('archlinux-java-run' 'java-runtime>=11' 'hicolor-icon-theme') makedepends=('icoutils') options=('!strip') source=("$pkgname-$pkgver.tar.gz::$url/${pkgver##*.}/HELI-X${pkgver%%.*}.tar.gz" @@ -20,7 +20,7 @@ source=("$pkgname-$pkgver.tar.gz::$url/${pkgver##*.}/HELI-X${pkgver%%.*}.tar.gz" sha512sums=('22e2323e71396dc38d94142ef6235b1002fec094ab00fbdc5dae59fd5863c5692ab4c8491f21af7c0a48588c368d339d6019f0fe91ade57fa790b55d13ddcb87' 'b8d49650284a8b7b05bc65aaed1c2bc3219cfa448165fb90b5953e2ad92a716a7543d1fb9da258162bf3541e116a7d59fc9235fdada263e8b5ff878cc4a35f31' '32cca4e3a8fcdee8553931b82bf867bfdf20594b02cce8125ad8967ed56f5d10405490dc9c12f50a4a37f8c280f4dfd843a228e09cf7ec7250ae7724de207b5b' - 'b834a975473b499b6924f0dd9b5ee6d463e94d2bc5232dd08e35b72bca0d862db44ca03bd64efee875e61f3b14162280f6daf79ed8c4c48a4e528e3e017cd33a' + 'b6b318c787c45602f0f1cfe1e30edfc56a2fec4fd98d8add9715ef950a9355dee0f5267378a4f4aade487bb75e26150b87ece9481278dee8c20775ca01669a90' '36af9602ad6b4654dba7651851ee51acf062a76824dc584fbb2e836e1438199ae5ee187d76b5cb56d8c260bce7ecdefa67e973d003678c3ed3ad3c107fa9c09d' '8be08b65cdc9007f4d39ab7a327a407bc7162d8d091d3e44294e11ddc6903151e35eb9999082332439b065ccac6ed6cb39bb2f0dae315483b00c9580e2184010') @@ -30,18 +30,20 @@ prepare() { # Use an installed java runtime engine instead of the provided one rm -rf Java - sed -i "s|./Java/jre11/bin/java|java|" runHELI-X.sh runHELI-X-Server.sh + sed -i \ + -e 's|./Java/jre[0-9]\+/bin/java|JAVA_HOME=$(archlinux-java-run --min 11 --java-home) \&\& \\\n"$JAVA_HOME"/bin/java|' \ + runHELI-X.sh runHELI-X-Server.sh # Use a local writable home path for config files and resources sed -i \ - -e "/java$s*-/{s/$s*$//}" \ - -e "/java$s*-/{s|\(.*\)$s|\1 -DheliX.path.home=\"\$HOME/.heli-x\" |}" \ + -e "/\/bin\/java/{s/$s*$//}" \ + -e "/\/bin\/java/{s|\(.*\)$s|\1 -DheliX.path.home=\"\$HOME/.heli-x\" |}" \ runHELI-X.sh runHELI-X-Server.sh } package() { - install -d -m755 "$pkgdir/usr/share/" - cp -R HELI-X${pkgver%%.*} "$pkgdir/usr/share/$pkgname" + install -d -m755 "$pkgdir/opt" + cp -R HELI-X${pkgver%%.*} "$pkgdir/opt/$pkgname" icotool -x HELI-X${pkgver%%.*}/runHeli-X.ico for res in {16,32,48,128,256}; do diff --git a/heli-x-wrapper.sh b/heli-x-wrapper.sh index d5f7f78ebb21..7d959c2d9811 100644 --- a/heli-x-wrapper.sh +++ b/heli-x-wrapper.sh @@ -1,11 +1,11 @@ #!/bin/sh APP_LOCAL_DIR=$HOME/.heli-x -APP_EXECUTABLE=/usr/share/heli-x/runHELI-X.sh +APP_EXECUTABLE=/opt/heli-x/runHELI-X.sh APP_VERSION=$(pacman -Qi heli-x | grep 'Version' | awk '{print $3}') # function to copy all resources to the local config directory and create a file which holds the current package version copy_resources () { - cp -R --preserve=timestamps /usr/share/heli-x/resources $APP_LOCAL_DIR/ + cp -R --preserve=timestamps /opt/heli-x/resources $APP_LOCAL_DIR/ touch $APP_LOCAL_DIR/resources/$APP_VERSION } |