s/fatal/die/ so that --force works as intended.

git-svn-id: http://www.fsfla.org/svn/fsfla/software/linux-libre/scripts@4844 559672b5-ba27-0410-b829-e8f1faed8b1b

diff --git a/deblob-2.6.27 b/deblob-2.6.27
index be65dab5250a940922aff7513df6cb4ace9f40e6..1bd73ad3f543b3a783ec24b4bcc169398ed86410 100755 (executable)
--- a/deblob-2.6.27
+++ b/deblob-2.6.27
@@ -44,7 +44,7 @@
 
 # For each kver release, start extra with an empty string, then count
 # from 1 if changes are needed that require rebuilding the tarball.
-kver=2.6.27 extra=1
+kver=2.6.27 extra=1++
 
 fatal () {
   echo "$@"
@@ -111,9 +111,9 @@ clean_blob () {
 dummy_blob () {
        #$1 = filename
        if test -f $1; then
-           fatal $1 exists, something is wrong
+           die $1 exists, something is wrong
        elif test ! -f firmware/Makefile; then
-           fatal firmware/Makefile does not exist, something is wrong
+           die firmware/Makefile does not exist, something is wrong
        fi
 
        clean_sed "s,`echo $1 | sed s,^firmware/,,`,\$(DEBLOBBED),g" \
@@ -123,9 +123,9 @@ dummy_blob () {
 clean_fw () {
        #$1 = firmware text input, $2 = firmware output
        if test ! -f $1; then
-               fatal $1 does not exist, something is wrong
+               die $1 does not exist, something is wrong
        elif test -f $2; then
-               fatal $2 exists, something is wrong
+               die $2 exists, something is wrong
        fi
        clean_blob $1 -s 4
        dummy_blob $2
@@ -134,9 +134,9 @@ clean_fw () {
 drop_fw_file () {
        #$1 = firmware text input, $2 = firmware output
        if test ! -f $1; then
-               fatal $1 does not exist, something is wrong
+               die $1 does not exist, something is wrong
        elif test -f $2; then
-               fatal $2 exists, something is wrong
+               die $2 exists, something is wrong
        fi
        clean_file $1
        dummy_blob $2

diff --git a/deblob-2.6.28 b/deblob-2.6.28
index 391d3dd8e5034ab59f7fdd99f87052c5d794c548..97f83d4b9e32fed98897d9e0a7917c789d4c918a 100755 (executable)
--- a/deblob-2.6.28
+++ b/deblob-2.6.28
@@ -111,9 +111,9 @@ clean_blob () {
 dummy_blob () {
        #$1 = filename
        if test -f $1; then
-           fatal $1 exists, something is wrong
+           die $1 exists, something is wrong
        elif test ! -f firmware/Makefile; then
-           fatal firmware/Makefile does not exist, something is wrong
+           die firmware/Makefile does not exist, something is wrong
        fi
 
        clean_sed "s,`echo $1 | sed s,^firmware/,,`,\$(DEBLOBBED),g" \
@@ -123,9 +123,9 @@ dummy_blob () {
 clean_fw () {
        #$1 = firmware text input, $2 = firmware output
        if test ! -f $1; then
-               fatal $1 does not exist, something is wrong
+               die $1 does not exist, something is wrong
        elif test -f $2; then
-               fatal $2 exists, something is wrong
+               die $2 exists, something is wrong
        fi
        clean_blob $1 -s 4
        dummy_blob $2
@@ -134,9 +134,9 @@ clean_fw () {
 drop_fw_file () {
        #$1 = firmware text input, $2 = firmware output
        if test ! -f $1; then
-               fatal $1 does not exist, something is wrong
+               die $1 does not exist, something is wrong
        elif test -f $2; then
-               fatal $2 exists, something is wrong
+               die $2 exists, something is wrong
        fi
        clean_file $1
        dummy_blob $2

diff --git a/deblob-2.6.29 b/deblob-2.6.29
index 93fae6307218ff52b6692b04ad1a660f72b8896d..ffaed83e6c18a7d7707321eb777990c03d865f6c 100755 (executable)
--- a/deblob-2.6.29
+++ b/deblob-2.6.29
@@ -111,9 +111,9 @@ clean_blob () {
 dummy_blob () {
        #$1 = filename
        if test -f $1; then
-           fatal $1 exists, something is wrong
+           die $1 exists, something is wrong
        elif test ! -f firmware/Makefile; then
-           fatal firmware/Makefile does not exist, something is wrong
+           die firmware/Makefile does not exist, something is wrong
        fi
 
        clean_sed "s,`echo $1 | sed s,^firmware/,,`,\$(DEBLOBBED),g" \
@@ -123,9 +123,9 @@ dummy_blob () {
 clean_fw () {
        #$1 = firmware text input, $2 = firmware output
        if test ! -f $1; then
-               fatal $1 does not exist, something is wrong
+               die $1 does not exist, something is wrong
        elif test -f $2; then
-               fatal $2 exists, something is wrong
+               die $2 exists, something is wrong
        fi
        clean_blob $1 -s 4
        dummy_blob $2
@@ -134,9 +134,9 @@ clean_fw () {
 drop_fw_file () {
        #$1 = firmware text input, $2 = firmware output
        if test ! -f $1; then
-               fatal $1 does not exist, something is wrong
+               die $1 does not exist, something is wrong
        elif test -f $2; then
-               fatal $2 exists, something is wrong
+               die $2 exists, something is wrong
        fi
        clean_file $1
        dummy_blob $2