Signed-off-by: Marc Kleine-Budde <mkl@xxxxxxxxxxxxxx>
---
Changes since v1:
- fix "if [ -z x${image} ]", tnx sha
defaultenv/bin/boot | 2 +-
defaultenv/bin/update | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/defaultenv/bin/boot b/defaultenv/bin/boot
index de4fa24..c97a396 100644
--- a/defaultenv/bin/boot
+++ b/defaultenv/bin/boot
@@ -74,7 +74,7 @@ if [ ! -e /dev/ram0.kernel ]; then
addpart /dev/ram0 8M@8M(kernel)
fi
-if [ x$kernel_loc = xnfs ] || [ x$kernel_loc = xtftp ]; then
+if [ x$kernel_loc = xnfs -o x$kernel_loc = xtftp ]; then
if [ x$ip = xdhcp ]; then
dhcp
fi
diff --git a/defaultenv/bin/update b/defaultenv/bin/update
index 7c37c36..d75d678 100644
--- a/defaultenv/bin/update
+++ b/defaultenv/bin/update
@@ -32,12 +32,12 @@ elif [ x${type} = xrootfs ]; then
type=root
elif [ x${type} = xbarebox ]; then
image=$bareboximage
- if [ x${image} = x ]; then
+ if [ -z ${image} ]; then
image=barebox.bin
fi
elif [ x${type} = xbareboxenv ]; then
image=$bareboxenvimage
- if [ x${image} = x ]; then
+ if [ -z ${image} ]; then
image=bareboxenv.bin
fi
else
@@ -45,7 +45,7 @@ else
exit 1
fi
-if [ x${imagename} != x ]; then
+if [ -n ${imagename} ]; then
image=${imagename}
fi
@@ -58,7 +58,7 @@ else
exit 1
fi
-if [ x${mode} != xtftp ] && [ x${mode} != xxmodem ] ; then
+if [ x${mode} != xtftp -a x${mode} != xxmodem ] ; then
echo "unsupported mode ${mode}."
. /env/bin/_update_help
exit 1
--
1.7.4.1
_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
