From 033be8f064bc856c55a37574c36600edca1277da Mon Sep 17 00:00:00 2001
From: Chris Ball <cjb@laptop.org>
Date: Mon, 5 Apr 2010 13:05:31 -0400
Subject: If fastjar 0.97/0.98 is installed, use jar instead.

Otherwise the build will crash, due to:
http://lists.gnu.org/archive/html/fastjar-dev/2009-12/msg00000.html
---
 etherpad/bin/rebuildjar.sh | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/etherpad/bin/rebuildjar.sh b/etherpad/bin/rebuildjar.sh
index fc05194..e733d6f 100755
--- a/etherpad/bin/rebuildjar.sh
+++ b/etherpad/bin/rebuildjar.sh
@@ -17,8 +17,15 @@
 bin/java-version.sh
 
 if [ -z "$JAR" ]; then
-    if [ ! -z `which fastjar` ]; then
-        JAR=fastjar
+    if [ ! -z $(which fastjar 2>/dev/null) ]; then
+        # http://lists.gnu.org/archive/html/fastjar-dev/2009-12/msg00000.html
+        version=`fastjar --version | grep fastjar | sed 's/.* //g'`
+        if [[ "$version" = "0.97" || "$version" = "0.98" ]]; then
+            echo "fastjar version $version can't build etherpad.  Falling back to standard jar."
+            JAR=jar
+        else
+            JAR=fastjar
+        fi
     else
         JAR=jar
     fi
-- 
cgit v1.2.3