[oe-commits] Peter Seebach : runqemu: replace bashism with working shell idiom

git at git.openembedded.org git at git.openembedded.org
Tue May 15 17:59:00 UTC 2012


Module: openembedded-core.git
Branch: master
Commit: 716ae8dbd1fb29292c9fca0f59d3807a54508e87
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=716ae8dbd1fb29292c9fca0f59d3807a54508e87

Author: Peter Seebach <peter.seebach at windriver.com>
Date:   Mon May 14 17:49:23 2012 -0500

runqemu: replace bashism with working shell idiom

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 at windriver.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 scripts/runqemu |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/scripts/runqemu b/scripts/runqemu
index 305e46a..fc7363f 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -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."





More information about the Openembedded-commits mailing list