Simplify and fix the 'flash' scripts

 - Instead of having multiple if/elif/fi blocks that all run nearly the
   same thing, use variables
 - Use consistent indent/formatting
 - Use the correct program name in the "Usage:" text
 - Fix a couple if blocks that were missing 'fi'
 - Fix a couple of invalid variable assignments ("$var = value" should be
   "var=value")

I haven't actually tested these, but then with the last 2 items, they
weren't working anyway.

1 files changed, 23 insertions, 33 deletions

diff --git a/macbook21_firstflash b/macbook21_firstflash
index 1b31401..21fdaa2 100755
--- a/macbook21_firstflash
+++ b/macbook21_firstflash
@@ -18,54 +18,44 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-## Don't add this here. Errors are *expected*
-# set -u -e -v
-set -v
-
-if [ $(uname -i) = "i686" ] || [ $(uname -m) = "i686" ]
-	then
-		echo "Running on i686. ok."
-		sleep 5
-elif [ $(uname -i) = "x86_64" ] || [ $(uname -m) = "x86_64" ]
-	then
-		echo "Running on x86_64. ok."
-		sleep 5
+set -u -e
+
+# These are the tested platforms
+if [ $(uname -i) = "i686" ] || [ $(uname -m) = "i686" ]; then
+	echo "Running on i686. ok."
+	arch=i686
+	sleep 5
+elif [ $(uname -i) = "x86_64" ] || [ $(uname -m) = "x86_64" ]; then
+	echo "Running on x86_64. ok."
+	arch=x86_64
+	sleep 5
 else
 	echo "This script must be run on an i686 or x86_64 host. x86_64 is recommended."
 	exit 1
 fi
+if [ -f "DEBLOB" ]; then
+	# In a src archive or git
+	arch=.
+fi
 
 if [[ $EUID -ne 0 ]]; then
-   echo "This script must be run as root" 
-   exit 1
+	echo "This script must be run as root"
+	exit 1
 fi
 
-# USE ROOT OR SUDO WHEN EXECUTING THIS
-# uses flashrom to flash the rom
-
 if (( $# != 1 )); then
-	echo "Usage: ./lenovobios_firstflash yourrom.rom"
-	echo "usage: ./lenovobios_firstflash path/to/yourrom.rom"
+	echo "usage: $0 path/to/yourrom.rom"
 	echo "You need to specify exactly 1 file"
 	exit 1
 fi
-if [ ! -f $1 ]; then
+if [ ! -f "$1" ]; then
 	echo "File not found!"
 	exit 1
 fi
 
-# flashrom doesn't recognize the machine unless you use that switch: laptop=force_I_want_a_brick
+set -v
+# flashrom doesn't recognize the machine unless you use that switch:
+# 	laptop=force_I_want_a_brick
 # after flashing libreboot and booting the machine, flashing normally will just work.
 
-if [ -f "DEBLOB" ]; then
-	# Means we are in src archive or git
-	./flashrom/flashrom -p internal:laptop=force_I_want_a_brick -w $1
-elif [ $(uname -i) = "i686" ] || [ $(uname -m) = "i686" ]
-	then
-		# Means we are in bin archive and on an i686 host
-		./flashrom/i686/flashrom -p internal:laptop=force_I_want_a_brick -w $1
-elif [ $(uname -i) = "x86_64" ] || [ $(uname -m) = "x86_64" ]
-	then
-		# Means we are in bin archive and on an x86_64 host
-		./flashrom/x86_64/flashrom -p internal:laptop=force_I_want_a_brick -w $1
-fi
+./flashrom/$arch/flashrom -p internal:laptop=force_I_want_a_brick -w $1