Skip to content

Commit

Permalink
change to how to config is written
Browse files Browse the repository at this point in the history
  • Loading branch information
pcaskey committed Oct 31, 2017
1 parent 85c5ed3 commit f7052ea
Showing 1 changed file with 18 additions and 12 deletions.
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

0 comments on commit f7052ea

Please sign in to comment.