From 25fcdf57de150041f9b67ac760972d53ee78d4ee Mon Sep 17 00:00:00 2001
From: Robin Gareus <robin@gareus.org>
Date: Fri, 24 Mar 2023 20:24:33 +0100
Subject: [PATCH] Fix Linux installer for demo-debug versions (amend 4bc8939)

---
 tools/linux_packaging/ardour.sh.in  | 2 +-
 tools/linux_packaging/build         | 1 -
 tools/linux_packaging/stage2.run.in | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/tools/linux_packaging/ardour.sh.in b/tools/linux_packaging/ardour.sh.in
index cb9b1a0176..d7fd8d4f02 100644
--- a/tools/linux_packaging/ardour.sh.in
+++ b/tools/linux_packaging/ardour.sh.in
@@ -48,5 +48,5 @@ if [ "T" = "$DEBUG" ]; then
 	export ARDOUR_INSIDE_GDB=1
 	exec gdb $INSTALL_DIR/bin/%EXENAME%-%VER%
 else
-	exec %WINE% $INSTALL_DIR/bin/%EXENAME%-%VER% "$@"
+	exec $INSTALL_DIR/bin/%EXENAME%-%VER% "$@"
 fi
diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build
index e7b57456a9..52212c0612 100755
--- a/tools/linux_packaging/build
+++ b/tools/linux_packaging/build
@@ -29,7 +29,6 @@ WITH_NLS=
 EXTERNAL_JACK=
 VENDOR=Ardour ;
 EXENAME=ardour
-WINEEXE=
 BUILDTYPE=""
 NOSTRIP="libsuil|libserd|libsord|liblilv|libsratom|liblrdf|libardour|libpbd|libevoral"
 
diff --git a/tools/linux_packaging/stage2.run.in b/tools/linux_packaging/stage2.run.in
index ad5b5a4ea2..3fa98d7a31 100755
--- a/tools/linux_packaging/stage2.run.in
+++ b/tools/linux_packaging/stage2.run.in
@@ -449,7 +449,7 @@ fi
 # Setup derived variables
 ################################
 PGM_VERSION=$(echo ${BUNDLE_DIR} | cut -d- -f2)
-PGM_BUILDTYPE=$(echo ${BUNDLE_DIR} | cut -d- -f3)
+PGM_BUILDTYPE=$(echo ${BUNDLE_DIR} | cut -d- -f3-)
 
 if [ -z ${PGM_BUILDTYPE} ];
 then