[Pkg-libvirt-commits] [virt-what] 03/04: Remove bashisms

[Guido Guenther]

This is an automated email from the git hooks/post-receive script.

agx pushed a commit to annotated tag debian/1.18-1
in repository virt-what.

commit 0561940210a6889f30919336e60e895fabb62515
Author: Guido Günther <agx at sigxcpu.org>
Date:   Wed Aug 2 14:19:35 2017 -0300

    Remove bashisms
---
 debian/patches/Remove-bashisms.patch | 43 ++++++++++++++++++++++++++++++++++++
 debian/patches/series                |  1 +
 2 files changed, 44 insertions(+)

diff --git a/debian/patches/Remove-bashisms.patch b/debian/patches/Remove-bashisms.patch
new file mode 100644
index 0000000..ec0baf6
--- /dev/null
+++ b/debian/patches/Remove-bashisms.patch
@@ -0,0 +1,43 @@
+From: =?utf-8?q?Guido_G=C3=BCnther_agx=40sigxcpu=2Eorg?=
+Date: =?utf-8?q?Wed=2C_2_Aug_2017_14=3A16=3A07_-0300?=
+Subject: =?utf-8?q?Remove_bashisms?=
+
+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
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..eeedbfa
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+Remove-bashisms.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/virt-what.git