From: Carl Baldwin Date: Sun, 13 Nov 2005 21:54:29 +0000 (-0700) Subject: Just some ideas on reducing verbosity while maintaining readability and functionality X-Git-Tag: release-0.4~16 X-Git-Url: http://git.pippins.net/embedvideo/.git/static/images/%7Bdone_action%7D?a=commitdiff_plain;h=785d464aefc1baf17592660c20ddd330da25cf39;p=backups%2F.git Just some ideas on reducing verbosity while maintaining readability and functionality --- diff --git a/scripts/config.sh b/scripts/config.sh index bfe1847..c3b4a26 100755 --- a/scripts/config.sh +++ b/scripts/config.sh @@ -27,3 +27,7 @@ backupdirs=" excludedirs=" " +function err() { + echo 2>&1 "-E- $1" + exit 1 +} diff --git a/scripts/pack-image.sh b/scripts/pack-image.sh index b6557f6..9a06f71 100755 --- a/scripts/pack-image.sh +++ b/scripts/pack-image.sh @@ -24,19 +24,21 @@ then then rm -rf $isomountdir fi - echo "-E- Unable to create the following directories: " - echo " $datadir $imagedir $isomountdir $tmpdir" - exit -1 + err "Unable to create the following directories: + $datadir $imagedir $isomountdir $tmpdir" fi echo "-> Creating the iso image in $isoimage" -dd if=/dev/null of=$isoimage bs=1M count=0 seek=4440 +dd of=$isoimage bs=1M count=0 seek=4440 + +[ $? != 0 ] && err "dd failed to create $isoimage" + mke2fs -b 2048 -F $isoimage + if [ $? != 0 ] then rm -rf $isomountdir $isoimage - echo "-E- Unable to create the iso image: $isoimage" - exit -1 + err "Unable to create the iso image: $isoimage" fi echo "-> Mounting the iso image" @@ -44,8 +46,7 @@ mount -t ext2 -o loop $isoimage $isomountdir if [ $? != 0 ] then rm -rf $isomountdir $isoimage - echo "-E- Unable to mount the iso image: $isoimage -> $isomountdir" - exit -1 + err "Unable to mount the iso image: $isoimage -> $isomountdir" fi echo "-> Directories being backedup and excluded:" @@ -81,33 +82,23 @@ if [ $? != 0 ] then umount $isomountdir rm -rf $isomountdir $isoimage - echo "-E- Unable to rsync to pack the image" - exit -1 + err "Unable to rsync to pack the image" fi echo "-> Copying over database and status file" cp $statusfile $backupdb $restorescript $isomountdir -if [ $? != 0 ] -then - echo "-E- Unable to copy the database and status file" - exit -1 -fi + +[ $? != 0 ] && err "Unable to copy the database and status file" echo "-> Unmounting image" umount $isomountdir -if [ $? != 0 ] -then - echo "-E- Unable to unmount the iso dir: $isomountdir" - exit -1 -fi + +[ $? != 0 ] && err "Unable to unmount the iso dir: $isomountdir" echo "-> Calculating md5sum for image" md5sum $isoimage | awk '{print$1}' > $isoimage.md5sum -if [ $? != 0 ] -then - echo "-E- Unable to calculatethe md5sum for this image: $isoimage" - exit -1 -fi + +[ $? != 0 ] && err "Unable to calculate the md5sum for this image: $isoimage" cat $statusfile | mailx -s "DVD image available to burn - $today" $mailto