Issue #27: use GEMSTONE_ETC_DIR if present ... default is GEMSTONE/se…

…aside/etc/gemstone.secret as before
dalehenrich · Feb 2, 2015 · 5bf0349 · 5bf0349
1 parent eec8f96
commit 5bf0349
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/bin/startGemServerGem b/bin/startGemServerGem
@@ -30,10 +30,15 @@ set -e # exit on error
 #
 # export GS_DEBUG_VMGC_PRINT_MKSW_MEMORY_USED=75
 
-if [ -s $GEMSTONE/seaside/etc/gemstone.secret ]; then
-    . $GEMSTONE/seaside/etc/gemstone.secret
+secret=$GEMSTONE/seaside/etc/gemstone.secret
+if [ "${GEMSTONE_ETC_DIR}x" = "x" ] ; then
+  secret=$GEMSTONE_ETC_DIR
+fi
+
+if [ -s $secret ]; then
+    . $secret
 else
-    echo 'Missing password file $GEMSTONE/seaside/etc/gemstone.secret'
+    echo 'Missing password file $secret'
     exit 1
 fi