Clean up java/beanshell, move it to libre/beanshell

5 files changed, 60 insertions, 45 deletions

diff --git a/java/beanshell/PKGBUILD b/java/beanshell/PKGBUILD
deleted file mode 100644
index 95b14d379..000000000
--- a/java/beanshell/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-# Maintainer (Arch): AndyRTR <andyrtr at archlinux.org>
-
-pkgname=beanshell
-pkgver=2.0b4
-pkgrel=2.1
-pkgdesc="Lightweight scripting for Java"
-url="http://www.beanshell.org/"
-license=('LGPL')
-
-provides=('bsh')
-
-arch=('any')
-depends=('java-runtime')
-makedepends=('apache-ant' 'java-commons-bsf2' 'javacc' 'java-servlet3.0-tomcat')
-source=("http://www.beanshell.org/bsh-${pkgver}-src.jar")
-
-prepare() {
-  cd "$srcdir"/BeanShell-$pkgver
-
-  rm lib/*.jar
-  ln -s /usr/share/java/bsf2.jar lib/
-  ln -s /usr/share/java/javacc.jar lib/
-  ln -s /usr/share/java/servlet-api.jar lib/servlet.jar
-}
-
-build() {
-  cd "$srcdir"/BeanShell-$pkgver
-  ant dist
-}
-
-check() {
-  cd "$srcdir"/BeanShell-$pkgver
-  ant test
-}
-
-package() {
-  cd "$srcdir"/BeanShell-$pkgver/dist
-  install -d "${pkgdir}"/usr/share/java/
-  for artifact in $(printf '%s\n' *.jar|sed 's/-[0-9b.]*\.jar$//'); do
-    install -m644 $artifact-$pkgver.jar "${pkgdir}"/usr/share/java/$artifact.jar
-  done
-}
-
-sha1sums=('69b36df249654a04e777ab899046c50b8cc844ac')
diff --git a/libre/beanshell/PKGBUILD b/libre/beanshell/PKGBUILD
new file mode 100644
index 000000000..80c947a96
--- /dev/null
+++ b/libre/beanshell/PKGBUILD
@@ -0,0 +1,52 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+# Maintainer (Arch:beanshell2): AndyRTR <andyrtr at archlinux.org>
+
+pkgname=beanshell
+pkgver=2.0b4
+pkgrel=3
+pkgdesc="Lightweight scripting for Java"
+url="http://www.beanshell.org/"
+license=('LGPL')
+
+arch=('any')
+depends=('java-runtime')
+makedepends=('apache-ant' 'java-commons-bsf2' 'javacc' 'tomcat7')
+source=("http://www.beanshell.org/bsh-${pkgver}-src.jar"
+        'bsh.sh'
+        'bsh-desktop.sh'
+        'bsh-window.sh')
+sha1sums=('69b36df249654a04e777ab899046c50b8cc844ac'
+          'dcf00fb8f445de72da1e77c42cc2d759291af5f1'
+          '4188603afd4834d73b91e5006ef2476a83954a04'
+          '5a125e0eb68d825d437f6c0c6a5d17afa2d76b93')
+
+prepare() {
+  cd "$srcdir"/BeanShell-$pkgver
+
+  rm lib/*.jar
+  ln -s /usr/share/java/bsf2.jar lib/
+  ln -s /usr/share/java/javacc.jar lib/
+  ln -s /usr/share/java/tomcat7/servlet-api.jar lib/servlet.jar
+}
+
+build() {
+  cd "$srcdir"/BeanShell-$pkgver
+  ant dist
+}
+
+check() {
+  cd "$srcdir"/BeanShell-$pkgver
+  ant test
+}
+
+package() {
+  cd "$srcdir"/BeanShell-$pkgver/dist
+  local artifact
+  for artifact in $(printf '%s\n' *.jar|sed 's/-[0-9b.]*\.jar$//'); do
+    install -Dm644 $artifact-$pkgver.jar "${pkgdir}"/usr/share/java/$artifact.jar
+  done
+  local exe
+  for exe in bsh bsh-desktop bsh-window; do
+    install -Dm755 "${srcdir}"/$exe.sh "${pkgdir}"/usr/bin/$exe
+  done
+}
diff --git a/libre/beanshell/bsh-desktop.sh b/libre/beanshell/bsh-desktop.sh
new file mode 100755
index 000000000..d95777877
--- /dev/null
+++ b/libre/beanshell/bsh-desktop.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec java -jar /usr/share/java/bsh.jar
diff --git a/libre/beanshell/bsh-window.sh b/libre/beanshell/bsh-window.sh
new file mode 100755
index 000000000..12f571bcc
--- /dev/null
+++ b/libre/beanshell/bsh-window.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+export CLASSPATH="/usr/share/java/bsh.jar${CLASSPATH:+:$CLASSPATH}"
+exec java bsh.util.AWTConsole
diff --git a/libre/beanshell/bsh.sh b/libre/beanshell/bsh.sh
new file mode 100755
index 000000000..70d30211d
--- /dev/null
+++ b/libre/beanshell/bsh.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+export CLASSPATH="/usr/share/java/bsh.jar${CLASSPATH:+:$CLASSPATH}"
+exec java bsh.Interpreter