[pkg-wine-party] [wine] 01/02: Simplify the foreign-arch test in the wine script.

[Jens Reyer]

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

jreyer-guest pushed a commit to branch master
in repository wine.

commit 3f761b7341b09510a8c31d6e69918ce464a417b1
Author: Jens Reyer <jre.winesim at gmail.com>
Date:   Fri Oct 14 14:58:16 2016 +0200

    Simplify the foreign-arch test in the wine script.
    
    Using "&&" shortcircuits the test (if the first expression is
    false the second won't be evaluated). This isn't the case with
    bash and dash using "-a".
    The new version of the second expression makes it more efficient
    and intuitive.
---
 debian/changelog       | 6 ++++++
 debian/scripts/wine.in | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 014715e..ecec94b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+wine-development (1.9.20-2) UNRELEASED; urgency=medium
+
+  * Simplify the foreign-arch test in the wine script.
+
+ -- Jens Reyer <jre.winesim at gmail.com>  Fri, 14 Oct 2016 14:57:50 +0200
+
 wine-development (1.9.20-1) unstable; urgency=medium
 
   * New upstream release 1.9.20, released Oct 1, 2016.
diff --git a/debian/scripts/wine.in b/debian/scripts/wine.in
index cf3e7df..b47b39c 100644
--- a/debian/scripts/wine.in
+++ b/debian/scripts/wine.in
@@ -5,7 +5,7 @@ wine64=/BINDIR/wine64
 
 wine32_hint () {
     echo "it looks like wine32VERSION is missing, you should install it."
-    if [ "$(dpkg --print-architecture)" = "amd64" -a "$(dpkg --print-foreign-architectures | grep -cx "i386")" -ne 1 ]; then
+    if [ "$(dpkg --print-architecture)" = "amd64" ] && ! dpkg --print-foreign-architectures | grep -qx "i386"; then
         echo "multiarch needs to be enabled first.  as root, please"
         echo "execute \"dpkg --add-architecture i386 && apt-get update &&"
         echo "apt-get install wine32VERSION\""

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