[Debian-islamic-commits] [SCM] Packaging for Zekr branch, master, updated. debian/0.7.5+repack-2-12-g34fa825

[أحمد المحمودي (Ahmed El-Mahmoudy)]

The following commit has been merged in the master branch:
commit b58b835c4b4751becb9562c575f651919fbd2a07
Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>
Date:   Mon Jun 28 09:50:55 2010 +0300

    * Clean up
    * Correctly parse command line arguments to o
    * Source /etc/zekr/zekrc as a system wide conf file instead of copying
      it as a user conf file.

diff --git a/debian/zekr.sh b/debian/zekr.sh
index 4eda6ba..ea9ec60 100644
--- a/debian/zekr.sh
+++ b/debian/zekr.sh
@@ -2,66 +2,63 @@
 
 version=""
 
-arg=$*
+args=$*
 
+ZEKR_WORKSPACE=~/.zekr
 
-    if [ -z "$*" ]; then
-    ##if zekr is called with "-workspace <dir>" option the following code is not executed.
-    ##Is it a bug?!
-#######
-    # Load default settings from the user's configuration file.
-    ZEKR_WORKSPACE=~/.zekr
+# Parse arguments:
+while [ ! -z $1 ]; do
+  case "$1" in
+    -workspace)
+      ZEKR_WORKSPACE=$2
+      shift
+      ;;
+  esac
+  shift
+done
 
-    ZEKR_CONF_FILE=${ZEKR_WORKSPACE}/zekrrc-debian
-    if [ ! -f "${ZEKR_CONF_FILE}" ]; then
-        mkdir -p ${ZEKR_WORKSPACE}
-        cp /etc/zekr/zekrrc "${ZEKR_CONF_FILE}"
-    fi
-    . ${ZEKR_CONF_FILE}
-#######
-
-
-    if [ ! -f ${ZEKR_WORKSPACE}/${version}.debian-lock ]; then
-    #The following code is executed once after each version upgrade.
-#####
-    ##if zekr is called with "-workspace <dir>" option the following code is not executed.
-    ##Is it a bug?!
-        if [ -z "$*"  ]; then
-    #       run -clean config 1>/dev/null
-    #       run -clean index-me 1>/dev/null
-            rm ${ZEKR_WORKSPACE}/*debian-lock -f
-            touch ${ZEKR_WORKSPACE}/${version}.debian-lock
-        fi
-#####
-    fi
+# If workspace dir. does not exist, create it:
+[ -d "${ZEKR_WORKSPACE}" ] || mkdir -p ${ZEKR_WORKSPACE}
 
+ZEKR_CONF_FILE=${ZEKR_WORKSPACE}/zekrrc-debian
 
-    ####
-    if [ ! "${ZEKR_WARNINGS}" = "disable" ]; then
-        MEQRN=1
-        if [ ! -e /usr/share/fonts/truetype/ttf-me_quran/me_quran_volt_newmet.ttf ]; then
-            MEQRN=0
-            zenity --warning \
-              --title="ttf-me-quran is not installed." \
-              --text="Uthman-Taha experimental theme cannot be used.\nInstall ttf-me-quran to enable Uthman-Taha theme."
- 
-        fi
-        if [ "$MEQRN" -eq 0 ]; then
-        
+# Source system wide configuration file first,
+[ ! -f /etc/zekr/zekrrc ] || . /etc/zekr/zekrrc
+# then user configuration file
+[ ! -f ${ZEKR_CONF_FILE} ] || . ${ZEKR_CONF_FILE}
 
-           zenity --question \
-             --title="Show Warning messages Next Time" \
-             --text="Do you want to leave warning message enabled?"
 
-            if [ $? -eq 1 ]; then
-                sed 's/ *ZEKR_WARNINGS.*=.*/ZEKR_WARNINGS=disable/' -i "${ZEKR_CONF_FILE}"
-            fi
-        fi
-    fi
-    ####
+if [ ! -f ${ZEKR_WORKSPACE}/${version}.debian-lock ]; then
+  rm ${ZEKR_WORKSPACE}/*debian-lock -f
+  touch ${ZEKR_WORKSPACE}/${version}.debian-lock
+fi
+
+
+if [ ! "${ZEKR_WARNINGS}" = "disable" ]; then
+  MEQRN=1
+  if [ ! -e /usr/share/fonts/truetype/ttf-me_quran/me_quran_volt_newmet.ttf ]; then
+    MEQRN=0
+    zenity --warning \
+      --title="ttf-me-quran is not installed." \
+      --text="Uthman-Taha experimental theme cannot be used.\nInstall ttf-me-quran to enable Uthman-Taha theme."
+  fi
+  if [ "$MEQRN" -eq 0 ]; then
+    zenity --question \
+      --title="Show Warning messages Next Time" \
+      --text="Do you want to leave warning message enabled?"
+
+    if [ $? -eq 1 ]; then
+      if grep ZEKR_WARNINGS "${ZEKR_CONF_FILE}" > /dev/null 2>&1 ; then
+        sed 's/ *ZEKR_WARNINGS.*=.*/ZEKR_WARNINGS=disable/' -i "${ZEKR_CONF_FILE}"
+      else
+        echo 'ZEKR_WARNINGS=disable' >> "${ZEKR_CONF_FILE}"
+      fi
 
+    fi
+  fi
 fi
 
+
 # using eclipse's method for setting ZEKR_JAVA_HOME
 # If the user has not set ZEKR_JAVA_HOME, cycle through our list of compatible VM's
 # and pick the first one that exists.
@@ -73,11 +70,7 @@ if [ -z "${ZEKR_JAVA_HOME}" -a ! -n "${ZEKR_JAVA_CMD}" ]; then
     for ZEKR_JAVA_HOME in $javahomelist ; do
 #        echo -n "  testing ${ZEKR_JAVA_HOME}..."
         if [ -x "${ZEKR_JAVA_HOME}/bin/java" ]; then
-#            export ZEKR_JAVA_HOME
-#            echo "found"
-            break
-#        else
-#            echo "not found"
+          break
         fi
     done
     IFS="$OFS"
@@ -102,7 +95,7 @@ JRE_OPT=-Djava.library.path=/usr/lib/jni/
 CLASS_PATH=/usr/share/java/log4j-1.2.jar:/usr/share/java/swt.jar:/usr/share/java/commons-collections3.jar:/usr/share/java/commons-codec.jar:/usr/share/java/commons-configuration.jar:/usr/share/java/commons-lang.jar:/usr/share/java/commons-io.jar:/usr/share/java/commons-logging.jar:/usr/share/java/velocity.jar:/usr/share/java/lucene-highlighter.jar:/usr/share/java/lucene-core.jar:/usr/share/java/lucene-snowball.jar:/usr/share/java/lucene-memory.jar:/usr/share/java/lucene-misc.jar:/usr/share/java/jl.jar:/usr/share/java/basicplayer.jar:/usr/share/java/tritonus_share.jar:/usr/share/java/jorbis.jar:/usr/share/java/jogg.jar:/usr/share/java/jspeex.jar:/usr/share/java/mp3spi.jar:/usr/share/java/vorbisspi.jar:dist/zekr.jar:
 VM_ARGS="-Xms10m -Xmx80m"
 
-"$ZEKR_JAVA_CMD" $VM_ARGS -cp "$CLASS_PATH" $JRE_OPT $MAIN_CLASS $*
+"$ZEKR_JAVA_CMD" $VM_ARGS -cp "$CLASS_PATH" $JRE_OPT $MAIN_CLASS $args
 }
 
 DIR_NAME=`dirname $0`

-- 
Packaging for Zekr