- include sysconfig file

- do not overwrite env variables
- use $() instead of ``

Changed files:
    JXplorer.sh -> 1.6

diff --git a/JXplorer.sh b/JXplorer.sh
index ecdadc587b57b6972d8cbc8622c305a2f77418b0..2b68757c00e038144c0c2abdf2269321e2eb136a 100644 (file)
--- a/JXplorer.sh
+++ b/JXplorer.sh
@@ -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 @@ if ! [ -d "$HOME/.JXplorer" ]; then
 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 &