diff options
Diffstat (limited to 'x60flashfrom5')
| -rwxr-xr-x | x60flashfrom5 | 56 |
1 files changed, 24 insertions, 32 deletions
diff --git a/x60flashfrom5 b/x60flashfrom5 index b9c3067..85616ae 100755 --- a/x60flashfrom5 +++ b/x60flashfrom5 @@ -1,6 +1,6 @@ #!/bin/bash -# x60flashfrom5 script: for X60 owners upgrading from 5th release +# x60flashfrom5: for X60 owners upgrading from 5th release # # Copyright (C) 2014 Francis Rowe <info@gluglug.org.uk> # @@ -18,52 +18,44 @@ # 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 - -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 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 -# boardmismatch=force is for people upgrading from libreboot 5th release, where the new ROM's are "ThinkPad X60 / X60s / X60t" +set -v +# boardmismatch=force is for people upgrading from libreboot 5th release, +# where the new ROM's are "ThinkPad X60 / X60s / X60t" # and the old ones are "ThinkPad X60 / X60s" and flashrom complains otherwise -if [ -f "DEBLOB" ]; then - # Means we are in src archive or git - ./flashrom/flashrom -p internal:boardmismatch=force -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:boardmismatch=force -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:boardmismatch=force -w $1 -fi - +./flashrom/$arch/flashrom -p internal:boardmismatch=force -w "$1" |