Viewer/archive/media/img/my/work/sync-flash.sh

@@ -66,10 +66,6 @@ while true ; do
 			echo "			default: $BASE"
 			echo "	--rsync		use rsync (default)"
 			echo "	--cp		use cp"
-			if ! [ -z $VERIFY ] ; then
-				echo "	--verify	toggle copy verification"
-				echo "			default: `[[ $SKIP_VERIFY ]] && echo "off" || echo "on"`"
-			fi
 			if ! [ -z $COMPRESSOR ] ; then
 				echo "	--compress	toggle archive compression"
 				echo "			default: `[[ $COMPRESS ]] && echo "on" || echo "off"`"
@@ -112,11 +108,6 @@ while true ; do
 			shift
 			break
 			;;
-		-verify|--verify)
-			SKIP_VERIFY=`[[ $SKIP_VERIFY ]] && echo "" || echo 1`
-			shift
-			break
-			;;
 		-compress|--compress)
 			COMPRESS=`[[ $COMPRESS ]] && echo "" || echo 1`
 			shift
@@ -151,31 +142,21 @@ while true ; do
 			echo "0) Build after this flash card: `[[ $LAST ]] && echo "yes" || echo "no"`"
 		fi
 		echo "1) Directoy description is: \"$TITLE\""
+		if [[ ! $DRIVE ]] ; then
+			echo "a-z|name) Type a drive letter, mount name in $BASE or path and start"
+			echo "          (paths must start with \"/\", \"./\" or \"[A-Z]:\")"
+		else
 			echo "a-z|name) Type a drive letter, mount name in $BASE or path and start"
 			echo "          (paths must start with \"/\", \"./\" or \"[A-Z]:\")"
-		if [[ $DRIVE ]] ; then
 			echo "Enter) Copy drive ${DRIVE}"
 		fi
 		echo "2) Build"
-
-		# dynamic options...
-		i=3
-		OPTION_VERIFICATION=
-		if ! [ -z $VERIFY ] ; then
-			echo "$i) Verification is `[[ $SKIP_VERIFY ]] && echo "off" || echo "on"`"
-			OPTION_VERIFICATION=$i
-			i=$(( i + 1 ))
-		fi
-
-		OPTION_COMPRESSION=
 		if ! [ -z $COMPRESSOR ] ; then
-			echo "$i) Compresion is `[[ $COMPRESS ]] && echo "on" || echo "off"`"
+			echo "3) Compresion is `[[ $COMPRESS ]] && echo "on" || echo "off"`"
-			OPTION_COMPRESSION=$i
+			echo "4) Quit"
-			i=$(( i + 1 ))
+		else
+			echo "3) Quit"
 		fi
-
-		echo "$i) Quit"
-		OPTION_QUIT=$i
 		read -ep ": " RES
 	
 		# NOTE: we can't use letters here as they will shadow 
@@ -208,17 +189,15 @@ while true ; do
 				LAST=1
 				break
 				;;
-
+			3)
-			# dynamic option handlers...
+				if ! [ -z $COMPRESSOR ] ; then
-			"$OPTION_VERIFICATION")
-				SKIP_VERIFY=`[[ ! $SKIP_VERIFY ]] && echo 1 || echo ""`
-				continue
-				;;
-			"$OPTION_COMPRESSION")
 					COMPRESS=`[[ ! $COMPRESS ]] && echo 1 || echo ""`
+				else
+					exit
+				fi
 				continue
 				;;
-			"$OPTION_QUIT")
+			4)
 				exit
 				;;
 
@@ -292,7 +271,7 @@ while true ; do
 
 		# verify copy...
 		# XXX make this more generic...
-		if ! [ $SKIP_VERIFY ] && ! [ -z $VERIFY ] ; then
+		if ! [ -z $VERIFY ] ; then
 			echo "Verifying copied files..."
 			$VERIFY $VERIFYFLAGS ${BASE}${DRIVE}/* "$DIR" \
 				> >(tee "${DIR}"/verification-err.log)