diff options
author | Luke Shumaker <lukeshu@sbcglobal.net> | 2014-12-27 17:39:12 -0500 |
---|---|---|
committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2014-12-27 17:39:12 -0500 |
commit | 63508d43f3c2f558c04065041919706cf2a86ef4 (patch) | |
tree | 21c3f1f9bd1f762a3571faabcc824efdf849d731 /flash | |
parent | e1839b53737ba6058a864fcc6d1c50f5784c9866 (diff) |
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.
Diffstat (limited to 'flash')
-rwxr-xr-x | flash | 53 |
1 files changed, 20 insertions, 33 deletions
@@ -1,6 +1,6 @@ #!/bin/bash -# flash script: uses flashrom to flash a new libreboot ROM image onto your machine +# flash: uses flashrom to flash a new libreboot ROM image onto your machine # # Copyright (C) 2014 Francis Rowe <info@gluglug.org.uk> # @@ -18,54 +18,41 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -## Don't add here. errors are expected. -# set -u -e -v -set -v +set -u -e # These are the tested platforms -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 +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 -# the user must be root to use flashrom 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 -# check that the user supplied a path to a ROM image: 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 the user did supply a path, check that it exists: -if [ ! -f $1 ]; then +if [ ! -f "$1" ]; then echo "File not found!" exit 1 fi +set -v # Use flashrom to flash the ROM image: - -if [ -f "DEBLOB" ]; then - # Means we are in src archive or git - ./flashrom/flashrom -p internal -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 -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 -w $1 -fi +./flashrom/$arch/flashrom -p internal -w $1 |