[Debian-islamic-commits] [SCM] Packaging for Zekr branch, master, updated. d78033c018590ff8aa47bcc38e7dbef7dabf6519

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit d78033c018590ff8aa47bcc38e7dbef7dabf6519
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Mon Dec 28 10:48:57 2009 +0100

    Shorter code for Xulrunner detection

diff --git a/debian/zekr.sh b/debian/zekr.sh
index bbbe8df..88453ba 100644
--- a/debian/zekr.sh
+++ b/debian/zekr.sh
@@ -98,18 +98,13 @@ fi
 
 # Detection of xulrunner
 XULRUNNER_PATH=""
-if [ -x /usr/bin/xulrunner ]; then
-    XULRUNNER_PATH=`xulrunner --find-gre $(xulrunner --gre-version 2>/dev/null) 2>/dev/null`
-    XULRUNNER_PATH=`dirname $XULRUNNER_PATH`
-else
-    for xulrunner in `ls -1 /usr/bin/xulrunner-* 2>/dev/null | sort -r`; do
-        XULRUNNER_PATH=`$xulrunner --find-gre $($xulrunner --gre-version 2>/dev/null) 2>/dev/null`
-        if [ ! -z "$XULRUNNER_PATH" -a -f "$XULRUNNER_PATH" ]; then
-            XULRUNNER_PATH=`dirname $XULRUNNER_PATH`
-            break
-        fi
-    done
-fi
+for xulrunner in /usr/bin/xulrunner `find /usr/bin -name "xulrunner-*" | sort -r`; do
+    XULRUNNER_PATH=`$xulrunner --find-gre $($xulrunner --gre-version 2>/dev/null) 2>/dev/null`
+    if [ ! -z "$XULRUNNER_PATH" -a -f "$XULRUNNER_PATH" ]; then
+        XULRUNNER_PATH=`dirname $XULRUNNER_PATH`
+        break
+    fi
+done
 if [ -z "$XULRUNNER_PATH" ]; then
     echo "Integrated browser support not working"
     echo "This Zekr build doesn't have support for the integrated browser."

-- 
Packaging for Zekr