From 5bf034932b8cd90cfb7af3491c053f20f3e8c4af Mon Sep 17 00:00:00 2001 From: Dale Henrichs Date: Mon, 2 Feb 2015 10:22:33 -0800 Subject: [PATCH] Issue #27: use GEMSTONE_ETC_DIR if present ... default is GEMSTONE/seaside/etc/gemstone.secret as before --- bin/startGemServerGem | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/bin/startGemServerGem b/bin/startGemServerGem index 25d824d..3d59f06 100755 --- 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