[arch-commits] Commit in jsampler/trunk (PKGBUILD jsampler-classic.sh jsampler.sh)

[David Runge]

    Date: Tuesday, July 30, 2019 @ 23:40:12
  Author: dvzrv
Revision: 495441

upgpkg: jsampler 0.9-8

Dropping unneeded startup script for jsampler classic (using one script with parameter to start fantasia or classic GUI). Exporting PATH for java-8-openjdk java in startup script.

Modified:
  jsampler/trunk/PKGBUILD
  jsampler/trunk/jsampler.sh
Deleted:
  jsampler/trunk/jsampler-classic.sh

---------------------+
 PKGBUILD            |   19 ++++++++++---------
 jsampler-classic.sh |    2 --
 jsampler.sh         |    9 ++++++++-
 3 files changed, 18 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-07-30 23:09:51 UTC (rev 495440)
+++ PKGBUILD	2019-07-30 23:40:12 UTC (rev 495441)
@@ -5,7 +5,7 @@
 pkgname=jsampler
 _name=JSampler
 pkgver=0.9
-pkgrel=7
+pkgrel=8
 pkgdesc="LinuxSampler Java GUI"
 arch=('any')
 url="http://jsampler.sourceforge.net/"
@@ -14,11 +14,9 @@
 depends=('java-runtime=8' 'linuxsampler')
 makedepends=('gendesk' 'java-environment=8' 'apache-ant')
 source=("https://downloads.sourceforge.net/${pkgname}/${_name}-${pkgver}.tar.bz2"
-        "${pkgname}.sh"
-        "${pkgname}-classic.sh")
+        "${pkgname}.sh")
 sha512sums=('cbb1d476b1f3882592cc0fb7a61348802c0c399dfc3fcc35f4a8ec3396e8417754cafc3e1a14a90b0014bebd29d28b9d3771dcbb772df40d241eaadedad5299f'
-            '632d6a160e026267a85c589b364076b7c439207022a2cdee7a6f432f13c9e34ca17a511fcdf35cd39030ed20dc5c92c670b06cf8ba862cb2f94ee8b552969a40'
-            '8bf4db721e1dc6489186b7c70d9bea1c00cd20d567d16e9940497ed2ba17eb02481faff43ab83efd15e2f254896abada19ae6c1148fffca8860d3d52fee3aaf8')
+            '2f0799de020eb81620e9e4b55ee7a9c752a599627798b874f081e2ee4dd692059883174f401e03475f7583bc07bba8ad038e7b49684af4e2face64e9d527cb55')
 
 prepare() {
   mv -v "${_name}-${pkgver}" "${pkgname}-${pkgver}"
@@ -27,6 +25,10 @@
     ["${pkgname}"]="Fantasia Java GUI"
     ["${pkgname}-classic"]="Classic Java GUI"
   )
+  declare -A exec_settings=(
+    ["${pkgname}"]="/usr/bin/${pkgname} fantasia"
+    ["${pkgname}-classic"]="/usr/bin/${pkgname} classic"
+  )
   declare -A names=(
     ["${pkgname}"]="Fantasia"
     ["${pkgname}-classic"]="Classic"
@@ -35,6 +37,7 @@
     gendesk -n \
             --pkgname "${_app}" \
             --name "${_name} ${names[${_app}]}" \
+            --exec "${exec_settings[${_app}]}" \
             --pkgdesc "${comments[${_app}]} for LinuxSampler" \
             --genericname "Audio Sampler" \
             --categories "AudioVideo;Audio"
@@ -53,12 +56,10 @@
   install -vDm 644 dist/Fantasia-${pkgver}.jar \
     "${pkgdir}/usr/share/java/${pkgname}/fantasia.jar"
   install -vDm 644 dist/JS_Classic-${pkgver}.jar \
-    "${pkgdir}/usr/share/java/${pkgname}/js-classic.jar"
-  # shell scripts
+    "${pkgdir}/usr/share/java/${pkgname}/classic.jar"
+  # start script
   install -vDm 755 "${srcdir}/${pkgname}.sh" \
     "${pkgdir}/usr/bin/${pkgname}"
-  install -vDm 755 "${srcdir}/${pkgname}-classic.sh" \
-    "${pkgdir}/usr/bin/${pkgname}-classic"
   # freedesktop.org compatibility
   install -vDm 644 res/fantasia/icons/app_icon.png \
     "${pkgdir}/usr/share/pixmaps/${pkgname}.png"

Deleted: jsampler-classic.sh
===================================================================
--- jsampler-classic.sh	2019-07-30 23:09:51 UTC (rev 495440)
+++ jsampler-classic.sh	2019-07-30 23:40:12 UTC (rev 495441)
@@ -1,2 +0,0 @@
-#!/bin/sh
-java -jar /usr/share/java/jsampler/js-classic.jar "$@"

Modified: jsampler.sh
===================================================================
--- jsampler.sh	2019-07-30 23:09:51 UTC (rev 495440)
+++ jsampler.sh	2019-07-30 23:40:12 UTC (rev 495441)
@@ -1,2 +1,9 @@
 #!/bin/sh
-java -jar /usr/share/java/jsampler/fantasia.jar "$@"
+
+export PATH="/usr/lib/jvm/java-8-openjdk/bin/:${PATH}"
+
+if [ $# -eq 0 ] || [ "$1" = "fantasia" ]; then
+  java -jar /usr/share/java/jsampler/fantasia.jar
+elif [ "$1" = "classic" ]; then
+  java -jar /usr/share/java/jsampler/classic.jar
+fi