[pkg-wine-party] [wine] 04/18: Generate static wine script.

[Jens Reyer]

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

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

commit d2194067993e236584d0f36344af3aa5598e047c
Author: Jens Reyer <jre.winesim at gmail.com>
Date:   Thu Jun 16 23:55:09 2016 +0200

    Generate static wine script.
---
 debian/rules        |  2 +-
 debian/scripts/wine | 13 +++++--------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/debian/rules b/debian/rules
index f889b44..4d7100d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -127,7 +127,7 @@ override_dh_auto_install-indep: $(INSTALLS)
 	mkdir -p debian/tmp
 	cp ANNOUNCE debian/tmp/changelog
 	cp programs/winedbg/README debian/tmp/README.winedbg
-	cp debian/scripts/wine debian/tmp/wine$(DEBSUFFIX)
+	sed "s|BINDIR|$(BINDIR)|g;s|VERSION|$(VERSION)|g" debian/scripts/wine.in > debian/tmp/wine$(DEBSUFFIX)
 	for dir in loader server programs/msiexec programs/winedbg \
 	    programs/wineconsole programs/regedit programs/regsvr32 \
 	    programs/wineboot programs/winefile programs/winepath \
diff --git a/debian/scripts/wine b/debian/scripts/wine
index 4e7b88f..cf3e7df 100755
--- a/debian/scripts/wine
+++ b/debian/scripts/wine
@@ -1,19 +1,16 @@
 #!/bin/sh -e
 
-script=$(basename $0)
-bindir=/usr/lib/$script
-
-wine32=$bindir/wine
-wine64=$bindir/wine64
+wine32=/BINDIR/wine
+wine64=/BINDIR/wine64
 
 wine32_hint () {
-    echo "it looks like $(echo $script | sed s/wine/wine32/) is missing, you should install it."
+    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
         echo "multiarch needs to be enabled first.  as root, please"
         echo "execute \"dpkg --add-architecture i386 && apt-get update &&"
-        echo "apt-get install $(echo $script | sed s/wine/wine32/)\""
+        echo "apt-get install wine32VERSION\""
     else
-        echo "as root, please execute \"apt-get install $(echo $script | sed s/wine/wine32/)\""
+        echo "as root, please execute \"apt-get install wine32VERSION\""
     fi
 }
 

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