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

Richard W.M. Jones rjones at redhat.com
Thu Sep 28 12:32:16 UTC 2017


On Fri, Aug 04, 2017 at 12:02:08PM -0300, Guido Günther wrote:
> Use [ instead of [[ so we fall back to test if necessary:
> 
>      http://pubs.opengroup.org/onlinepubs/9699919799/utilities/test.html
> 
> Gbp-Pq: Name Remove-bashisms.patch
> ---
> Updated with Eric's review comments addressed.
> 
>  virt-what.in | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/virt-what.in b/virt-what.in
> index 8c27b11..1c04bcc 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" ] && [ -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" ] && \
> +             [ -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

Sorry for the delay.  Usually better to CC me on important
patches to make sure I see them.

I've pushed this now, thanks!

Rich.

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
Read my programming and virtualization blog: http://rwmj.wordpress.com
virt-top is 'top' for virtual machines.  Tiny program with many
powerful monitoring features, net stats, disk stats, logging, etc.
http://people.redhat.com/~rjones/virt-top




More information about the virt-tools-list mailing list