format confirmation when no storage partition is present defaults to Y

rb1205 · rb1205 · commit 2fc5b82f755c · 2012-04-14T09:43:37.000+02:00
diff --git a/src/chroot_local-includes/lib/strings/bitsafe-format-storage b/src/chroot_local-includes/lib/strings/bitsafe-format-storage
@@ -35,7 +35,7 @@ MSG_FORMAT_NOSTO="`gettext \
 If this is the first time you are running BitSafe from this device
 there's nothing you should be worried about, and you can safely continue.\"`"
 
-MSG_FORMAT_CONT="`gettext \"You wish to continue? (y/n)\"`"
+MSG_FORMAT_CONT="`gettext \"You wish to continue? (Y/n)\"`"
 MSG_FORMAT_CHKSPC="`gettext \"* Checking available space\"`"
 MSG_FORMAT_KEYSMALL="`gettext \
 \"The device you are running bitsafe from is too small.
diff --git a/src/chroot_local-includes/usr/sbin/bitsafe-format-storage b/src/chroot_local-includes/usr/sbin/bitsafe-format-storage
@@ -68,14 +68,15 @@ CRYPT_DEVICE=/dev/"$DRIVE"2
 if [ -e $CRYPT_DEVICE ]; then
         warning "$MSG_FORMAT_THERESTO"
         read sec
-        if [[ "$sec" != "YES" ]]; then exit 1; fi
+        if [ -z "$sec" ] || [[ "$sec" != "YES" ]]; then exit 1; fi
         prstatus "$( printf "$MSG_FORMAT_DELPAR" "$CRYPT_DEVICE" )"
         parted /dev/$DRIVE rm 2 || critical_error "$MSG_FORMAT_ERRDEL"
 	NEW_DRIVE=false
 else
         notify "$MSG_FORMAT_NOSTO"
         while [ 1 ]; do
                 read -p "$MSG_FORMAT_CONT" ans
+		ans=${ans:-y}
                 if [ $ans = "n" ]; then exit; fi
                 if [ $ans = "y" ]; then break; fi
         done
