Skip to content

change to how to config is written #6

Merged
merged 1 commit into from
Oct 31, 2017
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 18 additions & 12 deletions configBuilder.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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...



Expand Down