- use jpackage instead of ugly hacks

Changed files:
    JXplorer.sh -> 1.4

diff --git a/JXplorer.sh b/JXplorer.sh
index 34141531acb15e612b4415e0a7cdbbfedaaae9c3..21a7e4ea811a776a3f3c8768e79141a5d04fdb20 100644 (file)
--- a/JXplorer.sh
+++ b/JXplorer.sh
@@ -1,12 +1,13 @@
 #!/bin/sh
 
-JX_OPTS=-Djxplorer.config="$HOME/.JXplorer"
+! [ -r /usr/share/java-utils/java-functions ] && exit 1
+
+. /usr/share/java-utils/java-functions 
+
+OPTIONS=-Djxplorer.config="$HOME/.JXplorer"
 JX_JAVADIR=/usr/share/java/JXplorer
 JX_DATADIR=/usr/share/JXplorer
 
-# Get config.
-[ -f /etc/sysconfig/jxplorer ] && . /etc/sysconfig/jxplorer
-
 JAVA_BIN="$JAVA_HOME/bin/java"
 
 if ! [ -d "$HOME/.JXplorer" ]; then
@@ -19,14 +20,12 @@ if ! [ -d "$HOME/.JXplorer" ]; then
 fi
 
 cd "$HOME/.JXplorer"
-CLASSPATH=`build-classpath junit jhall`
-CLASSPATH="$CLASSPATH:$JX_JAVADIR/jxplorer.jar:$JX_JAVADIR/help.jar"
-export CLASSPATH
+CLASSPATH=`build-classpath junit jhall JXplorer`
 
 if [ "$#" == "0" ]; then
-    exec "$JAVA_BIN" $JX_OPTS com.ca.directory.jxplorer.JXplorer < /dev/null > /dev/null 2>&1 &
+    run com.ca.directory.jxplorer.JXplorer < /dev/null > /dev/null 2>&1 &
   else if [ "$1" = "console" ] ; then
-    exec "$JAVA_BIN" $JX_OPTS com.ca.directory.jxplorer.JXplorer
+    run com.ca.directory.jxplorer.JXplorer
   else
     echo "Usage: $0 [console|help]"
   fi