dotCMS/core#5151

dotCMS · Mar 19, 2014 · 82a136d · 82a136d
1 parent eaa8f43
commit 82a136d
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/bin/dotStartup.sh b/bin/dotStartup.sh
@@ -31,9 +31,10 @@ if [ "x$RUN_CONF" = "x" ]; then
     RUN_CONF="$PRGDIR/build.conf"
 fi
 if [ -r "$RUN_CONF" ]; then
-    . "$RUN_CONF"
+    . "$RUN_CONF" 2>/dev/null
 fi
 
+DISTRIBUTION_HOME=`cd "$PRGDIR/.." ; pwd`
 TOMCAT_HOME=`cd "$PRGDIR/.." ; pwd`
 DOTCMS_HOME=`cd "$PRGDIR/../$HOME_FOLDER" ; pwd`
 
@@ -85,7 +86,7 @@ fi
 
 # Sets DOTSERVER if not specified and changes existing JAVA_OPTS to use it 
 if [ -z "$DOTSERVER" ]; then
-        DOTSERVER=`echo "$DOTCMS_HOME" | sed -e 's/\(.*\)\///'`
+        DOTSERVER=`echo "$DISTRIBUTION_HOME" | sed -e 's/\(.*\)\///'`
 fi
 export JAVA_OPTS="$JAVA_OPTS -Ddotserver=$DOTSERVER"