ammonite 1.0.3-1.

force it to use java 8.

2 files changed, 16 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1340fe29d461..9b8436b48532 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,19 @@
 # Generated by mksrcinfo v8
-# Sat Jan  6 16:45:54 UTC 2018
+# Sun Jun 10 08:33:19 UTC 2018
 pkgbase = ammonite
 	pkgdesc = A cleanroom re-implementation of the Scala REPL from first principles.
-	pkgver = 1.0.3
+	pkgver = 1.1.2
 	pkgrel = 1
 	url = https://github.com/lihaoyi/Ammonite
 	install = ammonite.install
 	arch = any
 	license = MIT
 	depends = scala>=2.12
-	noextract = ammonite-repl-1.0.3
-	source = ammonite-repl-1.0.3::https://github.com/lihaoyi/Ammonite/releases/download/1.0.3/2.12-1.0.3
+	depends = java-environment=8
+	noextract = ammonite-repl-1.1.2
+	source = ammonite-repl-1.1.2::https://github.com/lihaoyi/Ammonite/releases/download/1.1.2/2.12-1.1.2
 	source = https://github.com/lihaoyi/Ammonite/raw/master/LICENSE
-	sha256sums = 69ee90b067cb5546480c54887a3325f87e272464452fbeaaa0628379936bae3c
+	sha256sums = 2cbbec93b8ace067f9fcaa30615b1d815b3a094b1c2c2ec5c09ef6a3fcc954ad
 	sha256sums = 90320c4bcccf8df57cc5d6f7b0b1778231ae87c64fe5405bae45af4ff9f87e8e
 
 pkgname = ammonite
diff --git a/PKGBUILD b/PKGBUILD
index 3a1c7f8b27b4..b39ec3ac3842 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,20 +1,27 @@
+# Maintainer: wenLiangcan <boxeed at gmail dot com>
+# Contributor: ender4 <astrothayne@gmail.com>
+
 pkgname=ammonite
-pkgver=1.0.3
+pkgver=1.1.2
 pkgrel=1
 pkgdesc="A cleanroom re-implementation of the Scala REPL from first principles. "
 arch=('any')
 url="https://github.com/lihaoyi/Ammonite"
 license=('MIT')
 _scalaver=2.12
-depends=("scala>=${_scalaver}")
+depends=("scala>=${_scalaver}" 'java-environment=8')
 source=("ammonite-repl-${pkgver}"::"https://github.com/lihaoyi/Ammonite/releases/download/${pkgver}/${_scalaver}-${pkgver}"
         'https://github.com/lihaoyi/Ammonite/raw/master/LICENSE')
 noextract=("ammonite-repl-${pkgver}")
-sha256sums=('69ee90b067cb5546480c54887a3325f87e272464452fbeaaa0628379936bae3c'
+sha256sums=('2cbbec93b8ace067f9fcaa30615b1d815b3a094b1c2c2ec5c09ef6a3fcc954ad'
             '90320c4bcccf8df57cc5d6f7b0b1778231ae87c64fe5405bae45af4ff9f87e8e')
 install="${pkgname}.install"
 
 package() {
+    if [[ -z $JAVA_HOME ]]; then
+        JAVA_HOME=$(ls -d /usr/lib/jvm/java-8-* | head -n 1)
+    fi
+    sed -i "2s|^exec java|exec $JAVA_HOME/bin/java|" "ammonite-repl-${pkgver}"
     install -Dm755 "ammonite-repl-${pkgver}" "${pkgdir}/usr/bin/amm"
     install -Dm644 'LICENSE' "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }