From 39efa79743262e08bfa323e19b86e64a1a4de3ec Mon Sep 17 00:00:00 2001 From: David Abutbul Date: Sat, 29 Jan 2022 21:24:20 +0200 Subject: [PATCH] verbose vars --- docker/bin/docker-entrypoint.sh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/docker/bin/docker-entrypoint.sh b/docker/bin/docker-entrypoint.sh index d2b33dc0..34ff8cfa 100644 --- a/docker/bin/docker-entrypoint.sh +++ b/docker/bin/docker-entrypoint.sh @@ -2,25 +2,25 @@ set -e # Set some vars -PRE_POP_VOLS=("config" "mods" "art") # These are folders which contain runtime needed files, and need to be represented in the host -BBS_ROOT=/enigma-bbs # Install location -BBS_STG_P=/enigma-bbs-pre # Staging location for pre populated volumes (PRE_POP_VOLS) +PRE_POPULATED_VOLUMES=("config" "mods" "art") # These are folders which contain runtime needed files, and need to be represented in the host +BBS_ROOT_DIR=/enigma-bbs # Install location +BBS_STAGING_PATH=/enigma-bbs-pre # Staging location for pre populated volumes (PRE_POPULATED_VOLUMES) CONFIG_NAME=config.hjson # This is the default name, this script is intended for easy get-go - make changes as needed # Setup happens when there is no existing config file -if [[ ! -f $BBS_ROOT/config/$CONFIG_NAME ]]; then - for DIR in "${PRE_POP_VOLS[@]}" +if [[ ! -f $BBS_ROOT_DIR/config/$CONFIG_NAME ]]; then + for DIR in "${PRE_POPULATED_VOLUMES[@]}" do - if [ -n "$(find "$BBS_ROOT/$DIR" -maxdepth 0 -type d -empty 2>/dev/null)" ]; then - cp -rp $BBS_STG_P/$DIR/* $BBS_ROOT/$DIR/ + if [ -n "$(find "$BBS_ROOT_DIR/$DIR" -maxdepth 0 -type d -empty 2>/dev/null)" ]; then + cp -rp $BBS_STAGING_PATH/$DIR/* $BBS_ROOT_DIR/$DIR/ else - printf "WARN: skipped $BBS_ROOT/$DIR: Volume not empty or not a new setup; Files required to run ENiGMA 1/2 may be missing.\n Possible bad state\n" + printf "WARN: skipped $BBS_ROOT_DIR/$DIR: Volume not empty or not a new setup; Files required to run ENiGMA 1/2 may be missing.\n Possible bad state\n" printf "INFO: You have mounted folders with existing data - but no existing config json.\n\nPossible solutions:\n1. Make sure all volumes are set correctly specifically config volume... \n2. Check your configuration name if non-default\n\n\n" fi done ./oputil.js config new fi -if [[ ! -f $BBS_ROOT/config/$CONFIG_NAME ]]; then # Make sure once more, otherwise pm2-runtime will loop if missing the config +if [[ ! -f $BBS_ROOT_DIR/config/$CONFIG_NAME ]]; then # Make sure once more, otherwise pm2-runtime will loop if missing the config printf "ERROR: Missing configuration - ENiGMA 1/2 will not work. please run config\n" exit 1