From b4bd8df55708f51f18b401746f50a063d690ae55 Mon Sep 17 00:00:00 2001 From: chamunks Date: Tue, 5 Jun 2018 14:06:45 -0400 Subject: [PATCH] removed set -u it breaks unbound vars --- www.spee.ch/docker-entrypoint.sh | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/www.spee.ch/docker-entrypoint.sh b/www.spee.ch/docker-entrypoint.sh index 0c86f7c..742f369 100755 --- a/www.spee.ch/docker-entrypoint.sh +++ b/www.spee.ch/docker-entrypoint.sh @@ -1,6 +1,7 @@ #!/bin/bash -set -euo pipefail +set -eo pipefail ## Add -x to set if you want really explicit feedback. +## -u breaks unbound variables ## This docker-entrypoint will take a copy of the configuration and install any ## ENVVARS and then copy any required files into the /app/ directory next to any ## custom files added by the user. @@ -24,16 +25,14 @@ ENVVARS=("MYSQL_ENV_MYSQL_USER" "SITE_ADDRESS" "SITE_DESCRIPTION" ) -MYSQL_ENV_MYSQL_USER=alphauser -MYSQL_ENV_MYSQL_PASSWORD=alphapassword -MYSQL_ENV_MYSQL_DATABASE=alphadatabase -MYSQL_ENV_MYSQL_ADDRESS=alphaaddress -GOOGLE_ANALYTICS_UID=alphauid -SITE_TITLE=AlphaTitle -SITE_ADDRESS=alpha.address.com +# MYSQL_ENV_MYSQL_USER=alphauser +# MYSQL_ENV_MYSQL_PASSWORD=alphapassword +# MYSQL_ENV_MYSQL_DATABASE=alphadatabase +# MYSQL_ENV_MYSQL_ADDRESS=alphaaddress +# GOOGLE_ANALYTICS_UID=alphauid +# SITE_TITLE=AlphaTitle +# SITE_ADDRESS=alpha.address.com SITE_DESCRIPTION=alpha.description -echof info "$MYSQL_ENV_MYSQL_USER" -echof info "Established "'$'${ENVVARS[*]} function set_conf() { case $1 in @@ -157,8 +156,8 @@ if [ "$(ls -A /app)" ]; then else echof info "Speech not installed, installing fresh copy now." configure_speech - echof run "mv /usr/local/src/www.spee.ch/* /app/" - mv /usr/local/src/www.spee.ch/* /app/ + echof run "cp -rv /usr/local/src/www.spee.ch/* /app/" + cp -rv /usr/local/src/www.spee.ch/* /app/ final_permset fi