From 09c1bb45d89c78a9fd80c7a500cb29a0908dc668 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Sat, 14 Jun 2014 19:20:37 -0400
Subject: libre/antlr2: simplify runantlr2 script

---
 libre/antlr2/PKGBUILD     | 8 ++++----
 libre/antlr2/runantlr2.sh | 6 ++----
 2 files changed, 6 insertions(+), 8 deletions(-)

(limited to 'libre')

diff --git a/libre/antlr2/PKGBUILD b/libre/antlr2/PKGBUILD
index 5d0fd6eb0..49dbd2226 100644
--- a/libre/antlr2/PKGBUILD
+++ b/libre/antlr2/PKGBUILD
@@ -10,17 +10,17 @@ pkgdesc="Another Tool for Language Recognition"
 url="http://www.antlr2.org/"
 license=('custom:Public Domain')
 
-pkgrel=6
+pkgrel=6.1 # newer than Arch's 2.7.7-6
 arch=('i686' 'x86_64')
 options=('staticlibs')
-makedepends=('java-environment' 'python2' 'sh' 'nant' 'jh')
+makedepends=('java-environment' 'python2' 'bash' 'nant' 'jh')
 
 source=("http://www.antlr2.org/download/antlr-${pkgver}.tar.gz"
 	"http://repo.maven.apache.org/maven2/antlr/antlr/$pkgver/antlr-$pkgver.pom"
 	'runantlr2.sh' 'gcc4.4.patch' 'mono.patch')
 md5sums=('01cc9a2a454dd33dcd8c856ec89af090'
          '78af3de823003f6d8dded39c70bc30ae'
-         '78e9bf86bd44722f232f80bc7b04dcfe'
+         '05cb34ec96d85fca430dda91c3200ba4'
          '158677e4c0f357afbb56656231a54815'
          '0d1960d27ff81f2fea0dd35a8290216f')
 
@@ -46,7 +46,7 @@ _install_license() {
 }
 
 package_antlr2() {
-  depends=('sh' 'antlr2-java')
+  depends=('bash' 'antlr2-java')
 
   install -Dm755 "$srcdir"/runantlr2.sh "$pkgdir"/usr/bin/runantlr2
   _install_license
diff --git a/libre/antlr2/runantlr2.sh b/libre/antlr2/runantlr2.sh
index aebc9dfa7..d274e56a9 100644
--- a/libre/antlr2/runantlr2.sh
+++ b/libre/antlr2/runantlr2.sh
@@ -1,5 +1,3 @@
-#!/bin/sh
-echo Running 'java antlr.Tool $*' with /usr/share/java/antlr2.jar appended to the CLASSPATH variable
-export CLASSPATH
-CLASSPATH=$CLASSPATH:/usr/share/java/antlr2.jar
+#!/bin/bash
+export CLASSPATH="/usr/share/java/antlr2.jar${CLASSPATH:+:$CLASSPATH}"
 java antlr.Tool "$@"
-- 
cgit v1.2.3