From f7052eab7c2b37f5d3110c1bda947a0cd176b87d Mon Sep 17 00:00:00 2001 From: Paul Caskey Date: Tue, 31 Oct 2017 11:39:16 -0500 Subject: [PATCH] change to how to config is written --- configBuilder.sh | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/configBuilder.sh b/configBuilder.sh index e1081f1..3eaa07a 100644 --- a/configBuilder.sh +++ b/configBuilder.sh @@ -541,21 +541,27 @@ echo "" fi +#copy files directly instead of zipping +cp -R ./* /output +rm -f /ouput/Dockerfile +rm -f /ouput/configBuilder.sh +rm -f /ouput/setup.log -echo "" -echo "Archiving generated config..." -echo "" -#ensure zip -command -v zip >/dev/null 2>&1 || { echo >&2 "ERROR: zip is required, but doesn't appear to be installed. Aborting..."; exit 1; } -FILENAME=./shib-idp-config_`date +%m%d%Y-%H%M%S`.zip -zip -r ${FILENAME} ./* > /dev/null + +#echo "" +#echo "Archiving generated config..." +#echo "" +##ensure zip +#command -v zip >/dev/null 2>&1 || { echo >&2 "ERROR: zip is required, but doesn't appear to be installed. Aborting..."; exit 1; } +#FILENAME=./shib-idp-config_`date +%m%d%Y-%H%M%S`.zip +#zip -r ${FILENAME} ./* > /dev/null #special for the special-purpose container -cp ${FILENAME} /output -zip -d /output/${FILENAME:2} "configBuilder.sh" -zip -d /output/${FILENAME:2} "Dockerfile" -zip -d /output/${FILENAME:2} "setup.log" -echo copied archive to output location... +#cp ${FILENAME} /output +#zip -d /output/${FILENAME:2} "configBuilder.sh" +#zip -d /output/${FILENAME:2} "Dockerfile" +#zip -d /output/${FILENAME:2} "setup.log" +echo wrote config to output location...