Fix server scripts

enisher · enisher · commit 71f3faa6ef81 · 2013-11-20T16:40:09.000+02:00
diff --git a/graphdb/script/server.bat b/graphdb/script/server.bat
@@ -63,7 +63,9 @@ shift
 goto setArgs
 
 :doneSetArgs
-set CONFIG_FILE=%ORIENTDB_HOME%/config/orientdb-server-config.xml
+
+if NOT exist "%CONFIG_FILE%" set CONFIG_FILE=%ORIENTDB_HOME%/config/orientdb-server-config.xml
+
 set LOG_FILE=%ORIENTDB_HOME%/config/orientdb-server-log.properties
 set LOG_CONSOLE_LEVEL=info
 set LOG_FILE_LEVEL=fine
diff --git a/graphdb/script/server.sh b/graphdb/script/server.sh
@@ -52,6 +52,11 @@ cd $PRGDIR
 [ -f "$ORIENTDB_HOME"/bin/orient.sh ] || ORIENTDB_HOME=`cd "$PRGDIR/.." ; pwd`
 export ORIENTDB_HOME
 
+if [ ! -f "${CONFIG_FILE}" ]
+then
+  CONFIG_FILE=$ORIENTDB_HOME/config/orientdb-server-config.xml
+fi
+
 # Set JavaHome if it exists
 if [ -f "${JAVA_HOME}/bin/java" ]; then 
    JAVA=${JAVA_HOME}/bin/java
@@ -60,7 +65,6 @@ else
 fi
 export JAVA
 
-CONFIG_FILE=$ORIENTDB_HOME/config/orientdb-server-config.xml
 LOG_FILE=$ORIENTDB_HOME/config/orientdb-server-log.properties
 LOG_CONSOLE_LEVEL=info
 LOG_FILE_LEVEL=fine
