From 78e345b68fea725b6375882007178239ecb038f9 Mon Sep 17 00:00:00 2001 From: Francis Rowe Date: Fri, 12 Dec 2014 19:40:50 -0500 Subject: lenovobios_firstflash: Fix errors lenovobios_secondflash: Fix errors --- diff --git a/lenovobios_firstflash b/lenovobios_firstflash index ca58440..e5c9178 100755 --- a/lenovobios_firstflash +++ b/lenovobios_firstflash @@ -80,30 +80,28 @@ if [ ! -f "DEBLOB" ] then # i686 # needed for first flashing, otherwise machine will be bricked - { # try - ./bucts/i686/bucts 1 - } || { # catch + if [ ! -f "bucts/i686/bucts" ]; then echo "$errOut" exit 1 - } + fi + ./bucts/i686/bucts 1 else # x86_64 # needed for first flashing, otherwise machine will be bricked - { # try - ./bucts/x86_64/bucts 1 - } || { # catch + if [ ! -f "bucts/x86_64/bucts" ]; then echo "$errOut" exit 1 - } + fi + ./bucts/x86_64/bucts 1 + fi else # this means we are working in src # needed for first flashing, otherwise machine will be bricked - { # try - ./bucts/bucts 1 - } || { # catch + if [ ! -f "bucts/bucts" ]; then echo "$errOut" exit 1 - } + fi + ./bucts/bucts 1 fi # run both. one will fail (and be harmless), the other will succeed. diff --git a/lenovobios_secondflash b/lenovobios_secondflash index 25d70f5..f1a9fb3 100755 --- a/lenovobios_secondflash +++ b/lenovobios_secondflash @@ -82,30 +82,25 @@ if [ ! -f "DEBLOB" ] if [ $(uname -i) = "i686" ] || [ $(uname -m) = "i686" ] then # i686 - # needed for first flashing, otherwise machine will be bricked - { # try - ./bucts/i686/bucts 0 - } || { # catch + if [ ! -f "bucts/i686/bucts" ]; then echo "$errOut" exit 1 - } + fi + ./bucts/i686/bucts 0 else # x86_64 - # needed for first flashing, otherwise machine will be bricked - { # try - ./bucts/x86_64/bucts 0 - } || { # catch + if [ ! -f "bucts/x86_64/bucts" ]; then echo "$errOut" exit 1 - } + fi + ./bucts/x86_64/bucts 0 + fi else # this means we are working in src - # needed for first flashing, otherwise machine will be bricked - { # try - ./bucts/bucts 0 - } || { # catch + if [ ! -f "bucts/bucts" ]; then echo "$errOut" exit 1 - } + fi + ./bucts/bucts 0 fi -- cgit v0.9.1