ammonite 1.1.2-2.

2 files changed, 4 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9b8436b48532..408e019cb45a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,14 @@
 # Generated by mksrcinfo v8
-# Sun Jun 10 08:33:19 UTC 2018
+# Fri Jun 22 19:12:47 UTC 2018
 pkgbase = ammonite
 	pkgdesc = A cleanroom re-implementation of the Scala REPL from first principles.
 	pkgver = 1.1.2
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/lihaoyi/Ammonite
 	install = ammonite.install
 	arch = any
 	license = MIT
 	depends = scala>=2.12
-	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
diff --git a/PKGBUILD b/PKGBUILD
index b39ec3ac3842..1f11582c8583 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,15 +1,14 @@
 # Maintainer: wenLiangcan <boxeed at gmail dot com>
-# Contributor: ender4 <astrothayne@gmail.com>
 
 pkgname=ammonite
 pkgver=1.1.2
-pkgrel=1
+pkgrel=2
 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}" 'java-environment=8')
+depends=("scala>=${_scalaver}")
 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}")
@@ -18,10 +17,6 @@ sha256sums=('2cbbec93b8ace067f9fcaa30615b1d815b3a094b1c2c2ec5c09ef6a3fcc954ad'
 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"
 }