SOURCES: JXplorer.sh - include sysconfig file - do not overwrite env variab...

[pawelz]

Author: pawelz                       Date: Thu Mar 12 18:59:34 2009 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- include sysconfig file
- do not overwrite env variables
- use $() instead of ``

---- Files affected:
SOURCES:
   JXplorer.sh (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: SOURCES/JXplorer.sh
diff -u SOURCES/JXplorer.sh:1.5 SOURCES/JXplorer.sh:1.6
--- SOURCES/JXplorer.sh:1.5	Tue Aug 12 17:17:20 2008
+++ SOURCES/JXplorer.sh	Thu Mar 12 19:59:28 2009
@@ -4,11 +4,16 @@
 
 . /usr/share/java-utils/java-functions 
 
-OPTIONS=-Djxplorer.config="$HOME/.JXplorer"
-JX_JAVADIR=/usr/share/java/JXplorer
-JX_DATADIR=/usr/share/JXplorer
+if [ -r /etc/sysconfig/jxplorer ]; then
+	. /etc/sysconfig/jxplorer
+fi
+
+export JAVA_HOME
+
+JX_JAVADIR=${JX_JAVADIR:-"/usr/share/java/JXplorer"}
+JX_DATADIR=${JX_DATADIR:-"/usr/share/JXplorer"}
 
-JAVA_BIN="$JAVA_HOME/bin/java"
+JAVA_BIN=${JAVA_BIN:-"$JAVA_HOME/bin/java"}
 
 if ! [ -d "$HOME/.JXplorer" ]; then
   mkdir "$HOME/.JXplorer"
@@ -20,7 +25,7 @@
 fi
 
 cd "$HOME/.JXplorer"
-CLASSPATH=`build-classpath junit jhall JXplorer`
+CLASSPATH=$(build-classpath junit jhall JXplorer)
 
 if [ "$#" == "0" ]; then
     run com.ca.directory.jxplorer.JXplorer < /dev/null > /dev/null 2>&1 &
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/JXplorer.sh?r1=1.5&r2=1.6&f=u