.env-template needs quotes?

adjusted start.sh and install.sh
This commit is contained in:
Ulf Gebhardt 2022-02-07 07:17:20 +01:00
parent 4e87e5a7bf
commit 9676672a34
Signed by: ulfgebhardt
GPG Key ID: DA6B843E748679C9
3 changed files with 8 additions and 15 deletions

View File

@ -21,10 +21,10 @@ KLICKTIPP_APIKEY_DE=$KLICKTIPP_APIKEY_DE
KLICKTIPP_APIKEY_EN=$KLICKTIPP_APIKEY_EN
# Community
COMMUNITY_NAME=$COMMUNITY_NAME
COMMUNITY_NAME="$COMMUNITY_NAME"
COMMUNITY_URL=$COMMUNITY_URL
COMMUNITY_REGISTER_URL=$COMMUNITY_REGISTER_URL
COMMUNITY_DESCRIPTION=$COMMUNITY_DESCRIPTION
COMMUNITY_DESCRIPTION="$COMMUNITY_DESCRIPTION"
# Login Server
LOGIN_APP_SECRET=21ffbbc616fe

View File

@ -14,9 +14,13 @@ set +o allexport
# NOTE: all config values will be in process.env when starting
# the services and will therefore take precedence over the .env
if [ -f "$SCRIPT_DIR/.env" ]; then
export $(cat $SCRIPT_DIR/.env | sed 's/#.*//g' | xargs)
set -o allexport
source $SCRIPT_DIR/.env
set +o allexport
else
export $(cat $SCRIPT_DIR/.env.dist | sed 's/#.*//g' | xargs)
set -o allexport
source $SCRIPT_DIR/.env.dist
set +o allexport
fi
# Configure git

View File

@ -26,26 +26,15 @@ fi
# Load .env or .env.dist if not present
if [ -f "$SCRIPT_DIR/.env" ]; then
# export $(cat $SCRIPT_DIR/.env | sed 's/#.*//g' | xargs -0)
# export $(grep -v '^#' $SCRIPT_DIR/.env | xargs -d '\n')
set -o allexport
source $SCRIPT_DIR/.env
set +o allexport
else
#export $(cat $SCRIPT_DIR/.env.dist | sed 's/#.*//g' | xargs -0)
#export $(grep -v '^#' $SCRIPT_DIR/.env.dist | xargs -d '\n')
set -o allexport
source $SCRIPT_DIR/.env.dist
set +o allexport
fi
echo $COMMUNITY_DESCRIPTION
echo $COMMUNITY_NAME
echo "$COMMUNITY_DESCRIPTION"
echo "$COMMUNITY_NAME"
echo "${COMMUNITY_DESCRIPTION}"
echo "${COMMUNITY_NAME}"
# lock start
if [ -f $LOCK_FILE ] ; then
echo "Already building!"