Fix Java 16 support by using official launch script

2 files changed, 5 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 78b34f803c9f..b43e0339c4ea 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ki-shell-bin
 	pkgdesc = Kotlin Language Interactive Shell
 	pkgver = 0.3.3
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/Kotlin/kotlin-interactive-shell
 	arch = any
 	license = Apache
@@ -13,4 +13,3 @@ pkgbase = ki-shell-bin
 	md5sums = 3644c712f0ad0a1e3453f2507be39e1c
 
 pkgname = ki-shell-bin
-
diff --git a/PKGBUILD b/PKGBUILD
index 17604b6e6f4b..e78a20a66886 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 _pkgname=ki-shell
 pkgname=ki-shell-bin
 pkgver=0.3.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Kotlin Language Interactive Shell"
 arch=('any')
 url='https://github.com/Kotlin/kotlin-interactive-shell'
@@ -13,16 +13,13 @@ conflicts=("${_pkgname}")
 source=("https://repo1.maven.org/maven2/org/jetbrains/kotlinx/$_pkgname/$pkgver/$_pkgname-$pkgver-archive.zip")
 md5sums=('3644c712f0ad0a1e3453f2507be39e1c')
 
-build() {
+prepare() {
 	cd "ki"
-	cat << EOF > ki
-#!/bin/sh
-java -jar /usr/lib/${_pkgname}/${_pkgname}.jar
-EOF
+	sed -i "s|KI_SHELL=\$SCRIPT_DIR/../lib/ki-shell.jar|KI_SHELL=/usr/lib/${_pkgname}/${_pkgname}.jar|" bin/ki.sh
 }
 
 package() {
 	cd "ki"
 	install -Dm644 "lib/${_pkgname}.jar" -t "${pkgdir}/usr/lib/${_pkgname}"
-	install -Dm755 "ki" -t "${pkgdir}/usr/bin"
+	install -Dm755 "bin/ki.sh" -T "${pkgdir}/usr/bin/ki"
 }