]> code.ossystems Code Review - openembedded-core.git/commitdiff
runqemu: replace bashism with working shell idiom
authorPeter Seebach <peter.seebach@windriver.com>
Mon, 14 May 2012 22:49:23 +0000 (17:49 -0500)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 15 May 2012 17:44:36 +0000 (18:44 +0100)
The =~ operator is not one of my favorites, not just due to portability
issues, but because it's not well known, and a lot of people might
not expect a regex operator.

The canonical shell idiom for this is to use case with alternation
and wildcards.  As a side note, if you are matching anything containing
core-image-sato, you don't need to also check for core-image-sato-sdk.

Signed-off-by: Peter Seebach <peter.seebach@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
scripts/runqemu

index 305e46aebfdb371b01957494654df5cec913dfca..fc7363fdd8fc7849824c2459d7dd1d7fdc5886c2 100755 (executable)
@@ -300,14 +300,15 @@ findimage() {
     # recently created one is the one we most likely want to boot.
     filenames=`ls -t $where/*-image*$machine.$extension 2>/dev/null | xargs`
     for name in $filenames; do
-        if [ "$name" =~ core-image-sato-sdk -o \
-              "$name" =~ core-image-sato     -o \
-              "$name" =~ core-image-lsb      -o \
-              "$name" =~ core-image-basic    -o \
-              "$name" =~ core-image-minimal ]; then
+        case $name in
+        *core-image-sato* | \
+        *core-image-lsb* | \
+        *core-image-basic* | \
+        *core-image-minimal* )
             ROOTFS=$name
             return
-        fi     
+            ;;
+        esac
     done
 
     echo "Couldn't find a $machine rootfs image in $where."