- more @DATADIR@ substitutions

[packages/JXplorer.git] / JXplorer.sh

diff --git a/JXplorer.sh b/JXplorer.sh
index 21a7e4ea811a776a3f3c8768e79141a5d04fdb20..c8bdbcf1c9e7975f614700eaf90bc319794adca6 100644 (file)
--- a/JXplorer.sh
+++ b/JXplorer.sh
@@ -1,14 +1,14 @@
 #!/bin/sh
 
-! [ -r /usr/share/java-utils/java-functions ] && exit 1
+[ -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
+if [ -r /etc/sysconfig/jxplorer ]; then
+       . /etc/sysconfig/jxplorer
+fi
 
-JAVA_BIN="$JAVA_HOME/bin/java"
+JX_DATADIR=${JX_DATADIR:-"@DATADIR@/JXplorer"}
 
 if ! [ -d "$HOME/.JXplorer" ]; then
   mkdir "$HOME/.JXplorer"
@@ -20,12 +20,14 @@ if ! [ -d "$HOME/.JXplorer" ]; then
 fi
 
 cd "$HOME/.JXplorer"
-CLASSPATH=`build-classpath junit jhall JXplorer`
+CLASSPATH=$(build-classpath junit jhall jxplorer)
+MAIN_CLASS=com.ca.directory.jxplorer.JXplorer
+JAVA_HOME=@JVMDIR@/java-sun-jre
 
 if [ "$#" == "0" ]; then
-    run com.ca.directory.jxplorer.JXplorer < /dev/null > /dev/null 2>&1 &
+    run < /dev/null > /dev/null 2>&1 &
   else if [ "$1" = "console" ] ; then
-    run com.ca.directory.jxplorer.JXplorer
+    run
   else
     echo "Usage: $0 [console|help]"
   fi