update

Author: Bart Sjerps

asmdisks.spec

@@ -1,6 +1,6 @@
 Name:		asmdisks
 Summary:	Replacement for Oracle ASMLib using UDEV
-Version:	1.4.5.1
+Version:	1.4.5.2
 Release:	1%{?dtap}
 BuildArch:	noarch
 License:	GPLv3+

src/CHANGELOG

@@ -1,3 +1,6 @@
+* Wed Nov 12 Bart Sjerps <bart@outrun.nl> 1.4.5.2
+- Fix usage/no parameters
+
 * Wed Nov 07 Bart Sjerps <bart@outrun.nl> 1.4.5.1
 - List of changes to asm:
 

src/bin/diskheader

@@ -30,7 +30,7 @@ while getopts ":hb:c:w:" OPT; do
 done
 shift $(expr $OPTIND - 1)
 
-test -z "$1" && usage && exit
+test -z "$1" && die "no disk specified"
 test -b "$1" || die "$1 is not a block device"
 
 dd if="$1" bs=${blksz:-1024} count=${count:-1} status=none | xxd -c ${width:-32}

src/bin/wipedisk

@@ -13,6 +13,8 @@ case $1 in
   -\?|--help) man $(basename $0) ; exit ;;
 esac
 
+die() { echo "$(basename $0): [die] $@" >&2 ; exit 10 ; }
+
 #============================================================================
 # Main section - parsing options etc
 # ---------------------------------------------------------------------------
@@ -23,13 +25,12 @@ while getopts ":hfn" OPT; do
   esac
 done
 shift $(expr $OPTIND - 1)
-test $# -lt 1 && { usage ; exit 10 ; }
+test $# -lt 1 && die "no parameters"
 
 if [ "$FORCE" == "Y" ]; then
   DISK=${1:-nodisk}
   if [ ! -b $DISK ]; then
-    echo "$DISK not found"
-    exit 1
+    die "$DISK not found"
   fi
   BKUP=$(echo $DISK | tr '/' '_')
   echo "Backing up 1st MB of $DISK in /tmp/$BKUP, restore with dd if=/tmp/$BKUP of=/dev/$DISK bs=1M count=1"