better packaging

3 files changed, 28 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a8f2776fc5e4..72f5ae85db72 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,15 @@
 pkgbase = jcdk-classic
 	pkgver = 3.0.5u1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.oracle.com/java/java-card.html
 	arch = any
 	license = custom
 	makedepends = msitools
 	options = !strip
 	source = http://download.oracle.com/otn-pub/java/java_card_kit/3.0.5/java_card_kit-classic-3_0_5-u1-win32-do-b35-15_may_2017.msi
+	source = jcdk.sh
 	md5sums = bf7e66cdc37aa1c022d8cb2b38a1443c
+	md5sums = cc1c1ba445ca83e2b1c2ed6cb2c7a59c
 
 pkgname = jcdk-classic
 	pkgdesc = Java Card Classic Development Kit
diff --git a/PKGBUILD b/PKGBUILD
index 605e36311aef..ac7ac0d40074 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,42 +1,50 @@
 #!/bin/bash
 # shellcheck disable=SC2034,SC2164
 # Maintainer: Alexandre Bouvier <contact@amb.tf>
-pkgname=('jcdk-classic' 'jcdk-classic-doc')
+pkgbase=jcdk-classic
+pkgname=("$pkgbase"{,-doc})
 pkgver=3.0.5u1
-pkgrel=1
+pkgrel=2
 arch=('any')
 url="https://www.oracle.com/java/java-card.html"
 license=('custom')
 makedepends=('msitools')
 options=('!strip')
-source=("http://download.oracle.com/otn-pub/java/java_card_kit/3.0.5/java_card_kit-classic-3_0_5-u1-win32-do-b35-15_may_2017.msi")
-md5sums=('bf7e66cdc37aa1c022d8cb2b38a1443c')
+source=("http://download.oracle.com/otn-pub/java/java_card_kit/3.0.5/java_card_kit-classic-3_0_5-u1-win32-do-b35-15_may_2017.msi"
+        "jcdk.sh")
+md5sums=('bf7e66cdc37aa1c022d8cb2b38a1443c'
+         'cc1c1ba445ca83e2b1c2ed6cb2c7a59c')
 
 DLAGENTS=('http::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -b oraclelicense=accept-securebackup-cookie -o %o %u')
 
 prepare() {
-	msiextract java_card_kit-classic-3_0_5-u1-win32-do-b35-15_may_2017.msi
+	msiextract "${source##*/}"
 }
 
 package_jcdk-classic() {
 	pkgdesc="Java Card Classic Development Kit"
 	depends=('java-environment>=7')
 
-	cd "Program Files/Oracle/Java Card Development Kit 3.0.5dev"
 	# shellcheck disable=SC2154
-	install -d "$pkgdir/usr/lib/$pkgbase"
-	for dir in api_export_files lib ; do
-		cp -a "$dir" "$pkgdir/usr/lib/$pkgbase"
-	done
+	install -Dm755 -t "$pkgdir/etc/profile.d" jcdk.sh
+	cd "Program Files/Oracle/Java Card Development Kit 3.0.5dev"
+
+	install -d "$pkgdir/usr/share/$pkgbase"
+	cp -a api_export_files "$pkgdir/usr/share/$pkgbase"
+
+	install -Dm644 -t "$pkgdir/usr/share/java/$pkgbase" lib/*.jar
+	ln -s "/usr/share/java/$pkgbase" "$pkgdir/usr/share/$pkgbase/lib"
+
+	install -Dm644 -t "$pkgdir/etc/$pkgbase" lib/logging.properties
+	ln -s "/etc/$pkgbase/logging.properties" "$pkgdir/usr/share/java/$pkgbase"
+
 	install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgbase" legal/*
 }
 
 package_jcdk-classic-doc() {
 	pkgdesc="Java Card Classic Development Kit Documentation"
 
-	cd "Program Files/Oracle/Java Card Development Kit 3.0.5dev"
 	install -d "$pkgdir/usr/share/doc/$pkgbase"
-	for dir in docs/* ; do
-		cp -a "$dir" "$pkgdir/usr/share/doc/$pkgbase"
-	done
+	cp -a "Program Files/Oracle/Java Card Development Kit 3.0.5dev"/docs/* \
+		"$pkgdir/usr/share/doc/$pkgbase"
 }
diff --git a/jcdk.sh b/jcdk.sh
new file mode 100644
index 000000000000..95b5eb714892
--- /dev/null
+++ b/jcdk.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+export JAVACARD_HOME=/usr/share/jcdk-classic
+export JC_HOME=$JAVACARD_HOME