From 862987344403417057deb453dd73887799cb0fcb Mon Sep 17 00:00:00 2001 From: Francis Rowe Date: Thu, 20 Nov 2014 23:23:00 -0500 Subject: scripts (error handling): Replace exit with exit 1 This is so that scripts using these in the future can more easily debug if errors occur. --- diff --git a/addseabios b/addseabios index eea70b4..1d9147e 100755 --- a/addseabios +++ b/addseabios @@ -27,12 +27,12 @@ echo "Adding SeaBIOS and SeaVGABIOS to the ROM's" # This is how we know. if [ -f "DEBLOB" ]; then echo "Do not run this in meta/src directory. Do it in binary archive, either with libreboot-supplied ROM images or your own binary archive created with 'build-release'." - exit + exit 1 fi if [ ! -f "cbfstool" ]; then echo "cbfstool not found. Please run ./builddeps-cbfstool first. Check the docs for how to get build dependencies." - exit + exit 1 fi # Add SeaBIOS and SeaVGABIOS to *all* ROM's diff --git a/builddeps-cbfstool b/builddeps-cbfstool index ee1240e..57d903f 100755 --- a/builddeps-cbfstool +++ b/builddeps-cbfstool @@ -27,7 +27,7 @@ set -u -e -v # This is how we know. if [ -f "DEBLOB" ]; then echo "Do not run this in meta/src directory. Do it in binary archive, either with libreboot-supplied ROM images or your own binary archive created with 'build-release'." - exit + exit 1 fi cd cbfstool_standalone diff --git a/buildrom-withgrub b/buildrom-withgrub index 489fac6..b86bbe9 100755 --- a/buildrom-withgrub +++ b/buildrom-withgrub @@ -28,7 +28,7 @@ if (( $# != 1 )); then echo "Usage: ./buildrom-withgrub boardname" echo "Example: ./buildrom-withgrub x60" echo "You need to specify exactly 1 argument" - exit + exit 1 fi cd coreboot diff --git a/flash b/flash index 7110635..91d4b87 100755 --- a/flash +++ b/flash @@ -29,11 +29,11 @@ if (( $# != 1 )); then echo "Usage: ./lenovobios_firstflash yourrom.rom" echo "usage: ./lenovobios_firstflash path/to/yourrom.rom" echo "You need to specify exactly 1 file" - exit + exit 1 fi if [ ! -f $1 ]; then echo "File not found!" - exit + exit 1 fi # boardmismatch=force is for people upgrading from libreboot 5th release, where the new ROM's are "ThinkPad X60 / X60s / X60t" diff --git a/lenovobios_firstflash b/lenovobios_firstflash index 4db50b7..4b25c13 100755 --- a/lenovobios_firstflash +++ b/lenovobios_firstflash @@ -31,11 +31,11 @@ if (( $# != 1 )); then echo "Usage: ./lenovobios_firstflash yourrom.rom" echo "usage: ./lenovobios_firstflash path/to/yourrom.rom" echo "You need to specify exactly 1 file" - exit + exit 1 fi if [ ! -f $1 ]; then echo "File not found!" - exit + exit 1 fi # needed for first flashing, otherwise machine will be bricked @@ -44,7 +44,7 @@ fi } || { # catch echo "BUCTS issue (most likely not compiled). Make sure BUC.TS is 1, or else you will brick your machine." echo "ABORTING so as to protect against bricking the machine." - exit + exit 1 } # run both. one will fail (and be harmless), the other will succeed. diff --git a/lenovobios_secondflash b/lenovobios_secondflash index 386f2c3..c0a1cc8 100755 --- a/lenovobios_secondflash +++ b/lenovobios_secondflash @@ -31,11 +31,11 @@ if (( $# != 1 )); then echo "Usage: ./lenovobios_firstflash yourrom.rom" echo "usage: ./lenovobios_firstflash path/to/yourrom.rom" echo "You need to specify exactly 1 file" - exit + exit 1 fi if [ ! -f $1 ]; then echo "File not found!" - exit + exit 1 fi # Flash it a 2nd time, to write upper 64K block diff --git a/macbook21_firstflash b/macbook21_firstflash index dbbe534..c414f26 100755 --- a/macbook21_firstflash +++ b/macbook21_firstflash @@ -29,11 +29,11 @@ if (( $# != 1 )); then echo "Usage: ./lenovobios_firstflash yourrom.rom" echo "usage: ./lenovobios_firstflash path/to/yourrom.rom" echo "You need to specify exactly 1 file" - exit + exit 1 fi if [ ! -f $1 ]; then echo "File not found!" - exit + exit 1 fi # flashrom doesn't recognize the machine unless you use that switch: laptop=force_I_want_a_brick -- cgit v0.9.1