From 4ac5def38adb65e392f0b7b3965c6763e8ae3fa4 Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Sun, 25 Sep 2011 22:54:04 +0200 Subject: defaultenv: simplify scripting Signed-off-by: Marc Kleine-Budde Signed-off-by: Wolfram Sang Signed-off-by: Sascha Hauer --- defaultenv/bin/boot | 2 +- defaultenv/bin/update | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'defaultenv') diff --git a/defaultenv/bin/boot b/defaultenv/bin/boot index de4fa24f27..c97a3969c7 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 55ac10b95d..6fd5e4ca26 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 elif [ x${type} = xxload ]; then @@ -47,7 +47,7 @@ else exit 1 fi -if [ x${imagename} != x ]; then +if [ -n ${imagename} ]; then image=${imagename} fi @@ -60,7 +60,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 -- cgit v1.2.3