summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2017-12-27 08:22:31 (GMT)
committerWaldemar Brodkorb <wbx@openadk.org>2017-12-27 08:22:31 (GMT)
commitd9e97c41a653e25ea842ad6110c014292deb8a20 (patch)
treeb769637518830d9b2dbd943e4942068b3e776662 /scripts
parentbd9e75b7c14472f80c80567a34746a9e225aaaec (diff)
better use LANG=C as discussed on the mailinglist, cleanup relocate errors
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/prereq.sh10
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/prereq.sh b/scripts/prereq.sh
index ca2b546..20e72f7 100755
--- a/scripts/prereq.sh
+++ b/scripts/prereq.sh
@@ -162,11 +162,11 @@ newdir=$(pwd)
if [ ! -z "$olddir" ]; then
if [ "$olddir" != "$newdir" ]; then
printf " ---> adk directory was relocated, fixing .."
- sed -i -e "s#$olddir#$newdir#g" $(find target_* -name \*.pc|xargs) 2>/dev/null
- sed -i -e "s#$olddir#$newdir#g" $(find host_${gnu_host_name} -type f|xargs) 2>/dev/null
- sed -i -e "s#$olddir#$newdir#g" $(find target_*/scripts -type f|xargs) 2>/dev/null
+ sed -i -e "s#$olddir#$newdir#g" $(find target_* -name \*.pc 2>/dev/null|xargs) 2>/dev/null
+ sed -i -e "s#$olddir#$newdir#g" $(find host_${gnu_host_name} -type f 2>/dev/null|xargs) 2>/dev/null
+ sed -i -e "s#$olddir#$newdir#g" $(find target_*/scripts -type f 2>/dev/null|xargs) 2>/dev/null
sed -i -e "s#$olddir#$newdir#" target_*/etc/ipkg.conf 2>/dev/null
- sleep 2
+ sleep 1
printf "done\n"
fi
fi
@@ -225,7 +225,7 @@ printf " ---> checking if bash is installed.. "
if which bash >/dev/null; then
printf "found\n"
printf " ---> checking if it is bash 4.x.. "
- bash --version 2>/dev/null| grep "GNU bash" | grep -i " 4." >/dev/null
+ LANG=C bash --version 2>/dev/null| grep -i "version 4" >/dev/null
if [ $? -eq 0 ]; then
printf "yes\n"
else