[virt-tools-list] [virt-what PATCH] Remove bashisms

Guido Günther agx at sigxcpu.org
Fri Aug 4 14:25:47 UTC 2017


Use [ instead of [[ and -a instead of && so we fall back to test if
necessary:

     http://pubs.opengroup.org/onlinepubs/9699919799/utilities/test.html
---
 virt-what.in | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/virt-what.in b/virt-what.in
index 8c27b11..56af1ad 100644
--- a/virt-what.in
+++ b/virt-what.in
@@ -360,20 +360,20 @@ if [ "$cpuid" = "OpenBSDVMM58" ]; then
 fi
 
 # Check for LDoms
-if [[ "$arch" == sparc* && -e ${root}/dev/mdesc ]]; then
+if [ ${arch#sparc} != "$arch" -a -e ${root}/dev/mdesc ]; then
     echo ldoms
-    if [[ -d ${root}/sys/class/vlds/ctrl && \
-             -d ${root}/sys/class/vlds/sp ]]; then
+    if [ -d ${root}/sys/class/vlds/ctrl -a \
+             -d ${root}/sys/class/vlds/sp ]; then
         echo ldoms-control
     else
         echo ldoms-guest
     fi
     MDPROP="${root}/usr/lib/ldoms/mdprop.py"
-    if [[ -x ${MDPROP} ]]; then
-        if [[ -n $($MDPROP -v iodevice device-type=pciex) ]]; then
+    if [ -x ${MDPROP} ]; then
+        if [ -n $($MDPROP -v iodevice device-type=pciex) ]; then
             echo ldoms-root
             echo ldoms-io
-        elif [[ -n $($MDPROP -v iov-device vf-id=0) ]]; then
+        elif [ -n $($MDPROP -v iov-device vf-id=0) ]; then
             echo ldoms-io
         fi
     fi
-- 
2.13.2




More information about the virt-tools-list mailing list