Update to 10.0.2465

Use a custom writable config folder inside HOME

Add wrapper which handles config folder creation and resource updates

Add patch to use the installed java runtime engine

Extract application icons from the source ico file

Add user manuals and license files

Simplify the desktop file

9 files changed, 99 insertions, 78 deletions

diff --git a/.AURINFO b/.AURINFO
deleted file mode 100644
index 4c46b62366c2..000000000000
--- a/.AURINFO
+++ /dev/null
@@ -1,18 +0,0 @@
-pkgbase = heli-x
-	pkgdesc = HELI-X RC Flight Simulator
-	pkgver = 5
-	pkgrel = 1
-	url = http://www.heli-x.info
-	install = heli-x.install
-	arch = i686
-	arch = x86_64
-	license = unknown
-	depends = java-runtime>=6
-	source = http://www.heli-x.info/1405/HELI-X5.tar.gz
-	source = heli-x.desktop
-	source = heli-x.png
-	source = heli-x.install
-	source = heli-x
-
-pkgname = heli-x
-
diff --git a/.SRCINFO b/.SRCINFO
index 51af932de669..f8ec8995be43 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,24 @@
 pkgbase = heli-x
-	pkgdesc = HELI-X RC Flight Simulator
-	pkgver = 5
+	pkgdesc = Professional R/C Flight Simulator
+	pkgver = 10.0.2465
 	pkgrel = 1
-	url = http://www.heli-x.info
-	install = heli-x.install
+	url = https://www.heli-x.info
 	arch = i686
 	arch = x86_64
-	license = unknown
-	depends = java-runtime>=6
-	source = http://www.heli-x.info/1405/HELI-X5.tar.gz
+	license = custom
+	makedepends = icoutils
+	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
+	source = heli-x-10.0.2465-manual_de.pdf::https://www.heli-x.info/help10/BedienungsanleitungV10.pdf
+	source = heli-x-10.0.2465-manual_en.pdf::https://www.heli-x.info/help10/UsersManualV10.pdf
+	source = heli-x-wrapper.sh
 	source = heli-x.desktop
-	source = heli-x.png
-	source = heli-x.install
-	source = heli-x
-	md5sums = 954c7c4123800c1bc9247294f5b2b791
-	md5sums = a7f340949236c7c4afa3851b313efc4b
-	md5sums = 30af503bd32a62decb15f8ca5e03d90e
-	md5sums = c58fca72b0c1b257196ea6d15e5c11c2
-	md5sums = a359f2c641c60a732e62da8d39a9be55
+	sha512sums = 22e2323e71396dc38d94142ef6235b1002fec094ab00fbdc5dae59fd5863c5692ab4c8491f21af7c0a48588c368d339d6019f0fe91ade57fa790b55d13ddcb87
+	sha512sums = b8d49650284a8b7b05bc65aaed1c2bc3219cfa448165fb90b5953e2ad92a716a7543d1fb9da258162bf3541e116a7d59fc9235fdada263e8b5ff878cc4a35f31
+	sha512sums = 32cca4e3a8fcdee8553931b82bf867bfdf20594b02cce8125ad8967ed56f5d10405490dc9c12f50a4a37f8c280f4dfd843a228e09cf7ec7250ae7724de207b5b
+	sha512sums = 4ae798d67237fd088917731174077712a190fa40ba92ff6e750757f3ee01a9ced2f95ef74fbb7ba908274b7911d3a25afe6309b309965bcbbf3626a55a15ef14
+	sha512sums = dd2ac99931247e7ec4eabbc9107a2cf54ff088b859c674d43e18ee999127298e5ae3d4272b3c1a03d29092f9b7d86d84a0c7be073e30976fb7ba9474dccad0f5
 
 pkgname = heli-x
-
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..72e8ffc0db8a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+*
diff --git a/PKGBUILD b/PKGBUILD
index aee645e091ab..6cbe1c43f2b8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,32 +1,56 @@
-# Maintainer: Ivan Agarkov <ivan.agarkov@gmail.com>
+# Maintainer: 0b100100 <0b100100 at protonmail dot ch>
+# Contributor: Ivan Agarkov <ivan.agarkov@gmail.com>
+
 pkgname=heli-x
-pkgver=5
+pkgver=10.0.2465
 pkgrel=1
-pkgdesc='HELI-X RC Flight Simulator'
+pkgdesc="Professional R/C Flight Simulator"
 arch=('i686' 'x86_64')
-url='http://www.heli-x.info'
-license=('unknown')
-depends=('java-runtime>=6')
-install=heli-x.install
-source=('http://www.heli-x.info/1405/HELI-X5.tar.gz' 'heli-x.desktop' 'heli-x.png' 'heli-x.install' 'heli-x')
-md5sums=('954c7c4123800c1bc9247294f5b2b791'
-         'a7f340949236c7c4afa3851b313efc4b'
-         '30af503bd32a62decb15f8ca5e03d90e'
-         'c58fca72b0c1b257196ea6d15e5c11c2'
-         'a359f2c641c60a732e62da8d39a9be55')
+url="https://www.heli-x.info"
+license=('custom')
+depends=('java-runtime=11' 'hicolor-icon-theme')
+makedepends=('icoutils')
+options=('!strip')
+source=("$pkgname-$pkgver.tar.gz::$url/${pkgver##*.}/HELI-X${pkgver%%.*}.tar.gz"
+        "$pkgname-$pkgver-manual_de.pdf::$url/help${pkgver%%.*}/BedienungsanleitungV${pkgver%%.*}.pdf"
+        "$pkgname-$pkgver-manual_en.pdf::$url/help${pkgver%%.*}/UsersManualV${pkgver%%.*}.pdf"
+        "$pkgname-wrapper.sh"
+        "$pkgname.desktop")
+sha512sums=('22e2323e71396dc38d94142ef6235b1002fec094ab00fbdc5dae59fd5863c5692ab4c8491f21af7c0a48588c368d339d6019f0fe91ade57fa790b55d13ddcb87'
+            'b8d49650284a8b7b05bc65aaed1c2bc3219cfa448165fb90b5953e2ad92a716a7543d1fb9da258162bf3541e116a7d59fc9235fdada263e8b5ff878cc4a35f31'
+            '32cca4e3a8fcdee8553931b82bf867bfdf20594b02cce8125ad8967ed56f5d10405490dc9c12f50a4a37f8c280f4dfd843a228e09cf7ec7250ae7724de207b5b'
+            'bc194ecf020df709780e33e22f625952483ca89beee8502b74c2a4c4242bb5b601d51b680ed1d0f3d8f6830f1128cdfa4360a492b0379c6f7171f3d368930f36'
+            'dd2ac99931247e7ec4eabbc9107a2cf54ff088b859c674d43e18ee999127298e5ae3d4272b3c1a03d29092f9b7d86d84a0c7be073e30976fb7ba9474dccad0f5')
+
+prepare() {
+  cd "HELI-X${pkgver%%.*}"
+
+  # Use installed java runtime
+  rm -rf Java
+  sed -i 's|^./Java/jre11/bin/java|java|' runHELI-X.sh runHELI-X-Server.sh
+
+  # Use a local writable config directory in the home folder
+  sed -i '/^java\ /{s|\(.*\)\ |\1\ -DheliX.path.home=\"\$HOME/.heli-x\"\ |}' runHELI-X.sh runHELI-X-Server.sh
+}
+
 package() {
-	cd "$srcdir/HELI-X5"
-	mkdir -p "$pkgdir/opt/heli-x"
-	cp -r * "$pkgdir/opt/heli-x"
-	cd "$pkgdir/opt/heli-x"
-	find . -iname '*.dll'|xargs rm
-	find . -iname '*.bat'|xargs rm
-	find . -type f|xargs chmod 644
-	find . -type d|xargs chmod 777
-	mkdir -p "$pkgdir/usr/bin/"
-	install -m 755 "$srcdir/heli-x" "$pkgdir/usr/bin/heli-x"
-	mkdir -p "$pkgdir/usr/share/applications"
-	cp "$srcdir/heli-x.desktop" "$pkgdir/usr/share/applications/"
-	mkdir -p "$pkgdir/usr/share/icons/hicolor/64x64/apps"
-	cp "$srcdir/heli-x.png" "$pkgdir/usr/share/icons/hicolor/64x64/apps/"
+  install -d -m755 $pkgdir/usr/share/
+  cp -R HELI-X${pkgver%%.*} "$pkgdir/usr/share/$pkgname"
+
+  icotool -x HELI-X${pkgver%%.*}/runHeli-X.ico
+  for res in {16,32,48,128,256}; do
+    install -Dm644 runHeli-X_*_${res}x${res}x32.png "$pkgdir/usr/share/icons/hicolor/${res}x${res}/apps/$pkgname.png"
+  done
+
+  install -Dm755 $pkgname-wrapper.sh "$pkgdir/usr/bin/$pkgname"
+  install -Dm644 $pkgname.desktop -t "$pkgdir/usr/share/applications/"
+
+  install -Dm644 $pkgname-$pkgver-manual_en.pdf "$pkgdir/usr/share/doc/$pkgname/manual_en.pdf"
+  install -Dm644 $pkgname-$pkgver-manual_de.pdf "$pkgdir/usr/share/doc/$pkgname/manual_de.pdf"
+
+  cd "HELI-X${pkgver%%.*}"
+  install -Dm644 libs/HeliX/license.txt -t "$pkgdir/usr/share/licenses/$pkgname/"
+  install -Dm644 libs/HeliX/license_e.txt -t "$pkgdir/usr/share/licenses/$pkgname/"
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/heli-x b/heli-x
deleted file mode 100644
index b9f561011e84..000000000000
--- a/heli-x
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-cd /opt/heli-x/
-sh runHELI-X.sh
diff --git a/heli-x-wrapper.sh b/heli-x-wrapper.sh
new file mode 100644
index 000000000000..a98b5912de51
--- /dev/null
+++ b/heli-x-wrapper.sh
@@ -0,0 +1,28 @@
+#!/bin/sh
+APP_LOCAL_DIR=$HOME/.heli-x
+APP_EXECUTABLE=/usr/share/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/
+  touch $APP_LOCAL_DIR/resources/$APP_VERSION
+}
+
+# create the local config directory if it does not exist
+mkdir -p $APP_LOCAL_DIR
+
+# copy all resources if they are not present in the local config directory
+if [ ! -d $APP_LOCAL_DIR/resources ]; then
+  copy_resources
+else
+  # backup old resources if they are present from another package version and then copy the current ones
+  if [ ! -f $APP_LOCAL_DIR/resources/$APP_VERSION ]; then
+    rm -rf $APP_LOCAL_DIR/resources.bak
+    mv $APP_LOCAL_DIR/resources $APP_LOCAL_DIR/resources.bak
+    copy_resources
+  fi
+fi
+
+# execute the heli-x application
+exec $APP_EXECUTABLE
diff --git a/heli-x.desktop b/heli-x.desktop
index 0df2903aaba2..3b131e1341b3 100644
--- a/heli-x.desktop
+++ b/heli-x.desktop
@@ -1,11 +1,8 @@
-#!/usr/bin/env xdg-open
 [Desktop Entry]
-Version=1.0
 Type=Application
 Name=HELI-X
-Comment=HELI-X 5 RC Flight Simulator
+Comment=Professional R/C Flight Simulator
 Exec=heli-x
 Icon=heli-x
 Terminal=false
-StartupNotify=false
-Categories=Game;
\ No newline at end of file
+Categories=Game;
diff --git a/heli-x.install b/heli-x.install
deleted file mode 100644
index ea579ebcada3..000000000000
--- a/heli-x.install
+++ /dev/null
@@ -1,9 +0,0 @@
-post_install() {
-    if [ -x usr/bin/gtk-update-icon-cache ]; then usr/bin/gtk-update-icon-cache usr/share/icons/hicolor/; fi
-    if [ -x usr/bin/update-desktop-database ]; then usr/bin/update-desktop-database; fi
-}
-
-post_remove() {
-    if [ -x usr/bin/gtk-update-icon-cache ]; then usr/bin/gtk-update-icon-cache usr/share/icons/hicolor/; fi
-    if [ -x usr/bin/update-desktop-database ]; then usr/bin/update-desktop-database; fi
-}
diff --git a/heli-x.png b/heli-x.png
deleted file mode 100644
index cf411ce4b92a..000000000000
--- a/heli-x.png
+++ /dev/null