projects
/
backups
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
37b254a
)
Changed grep -v against $logfile to throw out lines with control characters.
author
Alan Jack Pippin
<ajp@pippin.(none)>
Sat, 31 Dec 2005 15:33:09 +0000
(08:33 -0700)
committer
Alan J. Pippin
<ajp@pippins.net>
Sat, 31 Dec 2005 15:33:09 +0000
(08:33 -0700)
scripts/burn-imgs.sh
patch
|
blob
|
history
diff --git
a/scripts/burn-imgs.sh
b/scripts/burn-imgs.sh
index da5b11b911591dc15f2239bf663a8b5ae7dd96aa..f4b864976241059ff9a4e42022a651537ec0426b 100755
(executable)
--- a/
scripts/burn-imgs.sh
+++ b/
scripts/burn-imgs.sh
@@
-39,7
+39,7
@@
cdrecord-wrapper.sh $cdrecordopts dev=$sdev $img > $logfile 2>&1
if [ "0" != "$?" ]; then
echo >&2 "cdrecord failed!"
$cronstopstart start
if [ "0" != "$?" ]; then
echo >&2 "cdrecord failed!"
$cronstopstart start
- cat $logfile | grep -v
"MB written" | grep -v "to quit"
| mailx -s "backups: failed to burn $img!!!" $mailto
+ cat $logfile | grep -v
-e '[
\b
\r
]'
| mailx -s "backups: failed to burn $img!!!" $mailto
exit 1
fi
exit 1
fi
@@
-59,7
+59,7
@@
if ! cmp $md5sum $img.md5sum; then
echo "md5sum check FAILED" >> $logfile
echo "dd if=$dev bs=1M count=$imagesizemb 2>>$logfile | md5sum | awk '{print\$1}' > $md5sum" >> $logfile
e2label $dev >> $logfile
echo "md5sum check FAILED" >> $logfile
echo "dd if=$dev bs=1M count=$imagesizemb 2>>$logfile | md5sum | awk '{print\$1}' > $md5sum" >> $logfile
e2label $dev >> $logfile
- cat $logfile | grep -v
"MB written" | grep -v "to quit"
| mailx -s "DVD md5sum doesn't match image file!!!" $mailto
+ cat $logfile | grep -v
-e '[
\b
\r
]'
| mailx -s "DVD md5sum doesn't match image file!!!" $mailto
exit 1
fi
exit 1
fi
@@
-76,7
+76,7
@@
date >> $img.stat
cat $img.stat
echo
cat $logfile
cat $img.stat
echo
cat $logfile
-} | grep -v
"MB written" | grep -v "to quit"
| mailx -s "DVD burned. File as $(basename ${img%.*})" $mailto > $logfile 2>&1
+} | grep -v
-e '[
\b
\r
]'
| mailx -s "DVD burned. File as $(basename ${img%.*})" $mailto > $logfile 2>&1
# Two lines in the stat file indicate two successful burns. Clean-up the image.
if [ "$(wc -l $img.stat 2>/dev/null | awk '{print$1}')" == "$makeXcopies" ]; then
# Two lines in the stat file indicate two successful burns. Clean-up the image.
if [ "$(wc -l $img.stat 2>/dev/null | awk '{print$1}')" == "$makeXcopies" ]; then