From 941b739170dbe27edebfd97063701f621200f462 Mon Sep 17 00:00:00 2001
From: Paul Caskey <pcaskey@internet2.edu>
Date: Tue, 31 Oct 2017 13:48:21 -0500
Subject: [PATCH] bug fixes

---
 configBuilder.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/configBuilder.sh b/configBuilder.sh
index 9262a24..bd9e5ae 100644
--- a/configBuilder.sh
+++ b/configBuilder.sh
@@ -298,7 +298,7 @@ echo "mount all of their configuration from the container host's local "
 echo "filesystem or would you like to use a hybrid config utilizing secrets (requires a swarm)?"
 echo ""
 while [ ${BURNMOUNT} == "None" ]; do
-    echo -n "Please select your choice (please enter either \"burn\" or \"mount\" or \"hybrid\"): "
+    echo -n "Please select your choice (please enter either \"burn\" or \"mount\" or \"hybrid\", if you aren't sure, enter hybrid): "
     read response
     case $response in
         Mount|mount|M|m)
@@ -311,7 +311,7 @@ while [ ${BURNMOUNT} == "None" ]; do
             BURNMOUNT=hybrid
             ;;
 		*)
-			echo "You must choose either \"burn\" or \"mount\" or \"hybrid\" (default is hybrid)."
+			echo "You must choose either \"burn\" or \"mount\" or \"hybrid\"."
     esac
 done
 #echo "Burn/Mount option choice is: $BURNMOUNT"
@@ -472,6 +472,7 @@ s/^#     alternatives/     alternatives/
 s/^#     http/     http/
 s/^#     \&\&/     \&\&/
 EOF
+rm -f Dockerfile
 sed -f docker_edit.sed Dockerfile.dist > Dockerfile
 rm -f docker_edit.sed
 
@@ -484,6 +485,7 @@ if [ ${BURNMOUNT} == "burn" ] || [ ${BURNMOUNT} == "hybrid" ]; then
 s/^## ADD /ADD /
 /^VOLUME/,+10 s/^/#/
 EOF
+  rm -f Dockerfile
   sed -f docker_edit.sed Dockerfile.setup > Dockerfile
   rm -f Dockerfile.setup
   rm -f docker_edit.sed