From: Thomas Pérennou (Viveris Technologie) <thomas.perennou@external.thalesgroup.com>
Date: Mon, 16 Jun 2014 09:35:18 +0000 (+0200)
Subject: Bashisms hunt
X-Git-Tag: debian_7.5_20141208~71^2~8
X-Git-Url: https://secure.softndesign.org/git/?a=commitdiff_plain;h=016d4810413cd9c1251c07fda223276b24794741;p=debian6500.git

Bashisms hunt
---

diff --git a/install/bios/+init.sh b/install/bios/+init.sh
old mode 100644
new mode 100755
diff --git a/install/bios/update_bios_cfg.sh b/install/bios/update_bios_cfg.sh
index 8bd3516..e960e6f 100755
--- 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,7 +48,8 @@ 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
 
diff --git a/install/ipmi/update_blade_cfg.sh b/install/ipmi/update_blade_cfg.sh
index 413a9ca..59389e7 100755
--- a/install/ipmi/update_blade_cfg.sh
+++ b/install/ipmi/update_blade_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,7 +48,8 @@ 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