mirror of
https://github.com/flynx/ImageGrid.git
synced 2025-12-25 20:41:57 +00:00
Compare commits
2 Commits
97de482afa
...
ebbc553576
| Author | SHA1 | Date | |
|---|---|---|---|
| ebbc553576 | |||
| f857c6e456 |
@ -16,6 +16,9 @@ CPFLAGS=-Rpfv
|
|||||||
# override default...
|
# override default...
|
||||||
COPY=$RSYNC
|
COPY=$RSYNC
|
||||||
COPYFLAGS=$RSYNCFLAGS
|
COPYFLAGS=$RSYNCFLAGS
|
||||||
|
VERIFY=$RSYNC
|
||||||
|
VERIFYFLAGS=-n $RSYNCFLAGS
|
||||||
|
|
||||||
|
|
||||||
COMPRESSOR=./compress-archive.sh
|
COMPRESSOR=./compress-archive.sh
|
||||||
COMPRESS=1
|
COMPRESS=1
|
||||||
@ -254,6 +257,7 @@ while true ; do
|
|||||||
|
|
||||||
mkdir -vp "$DIR"
|
mkdir -vp "$DIR"
|
||||||
|
|
||||||
|
while true ; do
|
||||||
echo "Copying files from ${BASE}${DRIVE} (~`du -hs "${BASE}${DRIVE}" | cut -f 1`)..."
|
echo "Copying files from ${BASE}${DRIVE} (~`du -hs "${BASE}${DRIVE}" | cut -f 1`)..."
|
||||||
$COPY $COPYFLAGS ${BASE}${DRIVE}/* "$DIR" \
|
$COPY $COPYFLAGS ${BASE}${DRIVE}/* "$DIR" \
|
||||||
2> >(tee "${DIR}"/copy-err.log)
|
2> >(tee "${DIR}"/copy-err.log)
|
||||||
@ -263,6 +267,41 @@ while true ; do
|
|||||||
fi
|
fi
|
||||||
echo "Copying files: done."
|
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...
|
# exit interactive mode...
|
||||||
if [[ ! $MULTI || ! $INTERACTIVE || $LAST ]] ; then
|
if [[ ! $MULTI || ! $INTERACTIVE || $LAST ]] ; then
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user