[pkg-wine-party] [wine] 07/08: Enable WoW64 behavior in 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 5e6aa2163384a60ec907bfbf3fbd1a08523453ba
Author: Jens Reyer <jre.winesim at gmail.com>
Date:   Sun Jan 3 19:08:53 2016 +0100

    Enable WoW64 behavior in wine script.
    
    This requires wine64 and the 64-bit wineserver to be in PATH.
    The 32-bit wineserver must be neither in PATH nor in bindir (as
    configured on build).
    
    Closes: #769234
    Closes-in-wine-development: #762058
---
 debian/scripts/wine | 23 ++++-------------------
 1 file changed, 4 insertions(+), 19 deletions(-)

diff --git a/debian/scripts/wine b/debian/scripts/wine
index eb929a9..15c9280 100755
--- a/debian/scripts/wine
+++ b/debian/scripts/wine
@@ -6,11 +6,12 @@ bindir=/usr/lib/$name
 wine32=$bindir/wine
 wine64=$bindir/wine64
 
-if test -x $wine32 -a "$WINEARCH" != "win64"; then
+if test -x $wine32; then
     wine=$wine32
 elif test -x $wine64; then
     wine=$wine64
-    if [ "$(dpkg --print-architecture)" = "amd64" -a "$(dpkg --print-foreign-architectures | grep -cx "i386")" -ne 1 ]; then
+    if [ "$(dpkg --print-architecture)" = "amd64" -a "$(dpkg --print-foreign-architectures | grep -cx "i386")" -ne 1 ] ||
+       [ "$WINEARCH" = "win32" ]; then
         echo "it looks like multiarch needs to be enabled.  as root, please"
         echo "execute \"dpkg --add-architecture i386 && apt-get update &&"
         echo "apt-get install $(echo $name | sed s/wine/wine32/)\""
@@ -20,26 +21,10 @@ else
     exit 1
 fi
 
-if test -z "$WINEPREFIX"; then
-    if test "$wine" = "$wine64"; then
-        wineprefix=$HOME/.wine64
-    else
-        wineprefix=$HOME/.wine
-    fi
-else
-    wineprefix=$WINEPREFIX
-fi
-
-if test -z "$WINELOADER"; then
-    wineloader=$wine
-else
-    wineloader=$WINELOADER
-fi
-
 if test -z "$WINEDEBUG"; then
     winedebug=-all
 else
     winedebug=$WINEDEBUG
 fi
 
-WINEPREFIX=$wineprefix WINELOADER=$wineloader WINEDEBUG=$winedebug $wine "$@"
+WINEDEBUG=$winedebug $wine "$@"

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