cleanup...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>

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

@@ -16,6 +16,9 @@ CPFLAGS=-Rpfv
 # override default...
 COPY=$RSYNC
 COPYFLAGS=$RSYNCFLAGS
+VERIFY=$RSYNC
+VERIFYFLAGS=-n $RSYNCFLAGS
+
 
 COMPRESSOR=./compress-archive.sh
 COMPRESS=1
@@ -254,15 +257,51 @@ while true ; do
 
 	mkdir -vp "$DIR"
 
-	echo "Copying files from ${BASE}${DRIVE} (~`du -hs "${BASE}${DRIVE}" | cut -f 1`)..."
+	while true ; do
-	$COPY $COPYFLAGS ${BASE}${DRIVE}/* "$DIR" \
+		echo "Copying files from ${BASE}${DRIVE} (~`du -hs "${BASE}${DRIVE}" | cut -f 1`)..."
-		2> >(tee "${DIR}"/copy-err.log)
+		$COPY $COPYFLAGS ${BASE}${DRIVE}/* "$DIR" \
-	# no errors -> remove log...
+			2> >(tee "${DIR}"/copy-err.log)
-	if ! [ -s "${DIR}/copy-err.log" ] ; then
+		# no errors -> remove log...
-		rm -f "${DIR}"/copy-err.log
+		if ! [ -s "${DIR}/copy-err.log" ] ; then
-	fi
+			rm -f "${DIR}"/copy-err.log
-	echo "Copying files: done."
+		fi
+		echo "Copying files: done."
 
+		# verify copy...
+		# XXX make this more generic...
+		if ! [ -z $VERIFY ] ; then
+			echo "Verifying copied files..."
+			$VERIFY $VERIFYFLAGS ${BASE}${DRIVE}/* "$DIR" \
+				> >(tee "${DIR}"/verification-err.log)
+			if ! [ -s "${DIR}/verification-err.log" ] ; then
+				rm -f "${DIR}"/verification-err.log
+			else
+				echo
+				echo "WARNING: found mismatching files"
+				echo "	(see: "${DIR}"/verification-err.log)"
+				echo
+				while true; do
+					read -ep "[R]etry, [c]ontinue, or Ctrl-C to cancel: " ACTION
+					ACTION=`echo ${ACTION,,} | xargs`
+					if [[ $ACTION =~ [rc] ]] \
+							|| [ -z  $ACTION ] ; then
+						break
+					fi
+					echo "Unknown input: \"$ACTION\""
+				done
+				if [[ $ACTION == "c" ]] ; then
+					break
+				else
+					continue
+				fi
+			fi
+			echo "Verifification: done."
+			break
+		# no verification defined...
+		else
+			break
+		fi
+	done
 
 	# exit interactive mode...
 	if [[ ! $MULTI || ! $INTERACTIVE || $LAST ]] ; then