Merge remote-tracking branch 'origin/int_tr65_nra_2.3.2' into dev_tr65_ACA_871_chemin...

[debian6500.git] / install / bios / update_bios_cfg.sh

diff --git a/install/bios/update_bios_cfg.sh b/install/bios/update_bios_cfg.sh
index 8bd351680f50e0788192e346efd9711de6970a05..cbc110259ad3ba7c3d452c4ed86d1c4fb532f507 100755 (executable)
--- a/install/bios/update_bios_cfg.sh
+++ b/install/bios/update_bios_cfg.sh
@@ -9,7 +9,7 @@ mydir=$(cd $mydir; pwd)
 
 # formating functions
 
-_echo () { [ "$(echo -e '')" ] && echo $@ || echo -e $@; }
+_echo () { printf "$@\n"; }
 title () { _echo "\033[0;1m$*\033[0;0m"; }
 pass () { _echo "\033[1;32m$*\033[0;0m"; }
 warn () { _echo "\033[1;33m$*\033[0;0m"; }
@@ -48,18 +48,16 @@ done
   fail "Real mode, things will really append" || \
   warn "Dummy mode, nothing will be done"
 if [ ! "$ANS" = "yes" ]; then
-  read -p "Press 'y' to continue: " ANS
+  printf "Press 'y' to continue: "
+  read ANS
   [ "$ANS" = "y" ] || exit 1
 fi
 
 VERSION=$($mydir/dmidecode | awk '/BIOS Revision/ { print $(NF) }')
 title "BIOS version: $VERSION"
 
-case "$VERSION" in
-1.0b) CFG="bios-1.0b.cfg";;
-3.0) CFG="bios-3.0.cfg";;
-*) echo "unknown bios version ($VERSION)"; exit 1;;
-esac
+CFG="bios-$VERSION.cfg"
+[ -f $mydir/$CFG ] || { echo "unknown bios version ($VERSION)"; exit 1; }
 
 title "Configure BIOS"
 do_cmd $mydir/SCELNX_64 /i /s $mydir/$CFG /q