X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=deblob-2.6.24;h=c838cf4c1d85fdec60e77b743efcb0a882dc14d0;hb=257e2ff25d06b58dc8d336a6e2581703224fbbe2;hp=5ad33cac5f8d250ede0989fec078088dc9bd2698;hpb=09c3db739f5f81f8225a798d98323613804b3cfc;p=releases.git diff --git a/deblob-2.6.24 b/deblob-2.6.24 index 5ad33cac5f8d..c838cf4c1d85 100755 --- a/deblob-2.6.24 +++ b/deblob-2.6.24 @@ -46,9 +46,13 @@ # from 1 if changes are needed that require rebuilding the tarball. kver=2.6.24 extra=3++ -if unifdef /dev/null; then :; else - echo unifdef is required >&2 - exit 1 +case $1 in +--force) die () { echo ERROR: "$@": ignored >&2; }; shift;; +*) die () { echo "$@" >&2; exit 1; };; +esac + +if unifdef -Utest /dev/null; then :; else + die unifdef is required fi check=`echo $0 | sed 's,/[^/]*$,,'`/deblob-check @@ -62,19 +66,16 @@ fi function clean_file { #$1 = filename if test ! -f $1; then - echo $1 does not exist, something is wrong >&2 - exit 1 + die $1 does not exist, something is wrong fi rm -v $1 } function check_changed { if test ! -f $1; then - echo $1 does not exist, something is wrong >&2 - exit 1 + die $1 does not exist, something is wrong elif cmp $1.deblob $1 > /dev/null; then - echo $1 did not change, something is wrong >&2 - exit 1 + die $1 did not change, something is wrong fi mv $1.deblob $1 } @@ -83,8 +84,7 @@ function clean_blob { #$1 = filename if $have_check; then if test ! -f $1; then - echo $1 does not exist, something is wrong >&2 - exit 1 + die $1 does not exist, something is wrong fi name=$1 echo Removing blobs from $name @@ -122,7 +122,7 @@ function clean_mk { function clean_ifdef { #$1 = filename $2 = macro to -U echo unifdefing $1 with -U$2 - unifdef $1 -U$2 > $1.deblob + unifdef -U$2 $1 > $1.deblob check_changed $1 } @@ -163,8 +163,7 @@ for f in \ sound/pci/cs46xx/imgs/cwcdma.asp \ ; do if test ! $f; then - echo $f is not present, something is amiss >&2 - exit 1 + die $f is not present, something is amiss fi done