let’s call Mixbus “Mixbus”..

3 files changed, 20 insertions, 12 deletions

diff --git a/tools/linux_packaging/ardour.sh.in b/tools/linux_packaging/ardour.sh.in
index 3fce3241c1..21068da2eb 100644
--- a/tools/linux_packaging/ardour.sh.in
+++ b/tools/linux_packaging/ardour.sh.in
@@ -46,9 +46,9 @@ export LD_LIBRARY_PATH=$INSTALL_DIR/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
 
 if [ "T" = "$DEBUG" ]; then
 	export ARDOUR_INSIDE_GDB=1
-	exec gdb $INSTALL_DIR/bin/ardour-%VER%
+	exec gdb $INSTALL_DIR/bin/%EXENAME%-%VER%
 else
-	exec $INSTALL_DIR/bin/ardour-%VER% $ARGS
+	exec $INSTALL_DIR/bin/%EXENAME%-%VER% $ARGS
 fi
 
 
diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build
index 2c40d4dcaf..8a1cebc498 100755
--- a/tools/linux_packaging/build
+++ b/tools/linux_packaging/build
@@ -29,6 +29,7 @@ PRINT_SYSDEPS=
 WITH_NLS=
 EXTERNAL_JACK=
 VENDOR=Ardour ;
+EXENAME=ardour
 BUILDTYPE=""
 
 
@@ -55,7 +56,8 @@ while [ $# -gt 0 ] ; do
 		WITH_LADSPA=; 
 		STRIP=all
 		APPNAME=Mixbus ;
-                VENDOR=Harrison ;
+		VENDOR=Harrison ;
+		EXENAME=mixbus ;
 		shift ;;
 	--public)
 		WITH_NLS=1 ; 
@@ -237,14 +239,14 @@ echo export 'PATH=/usr/local/bin:/opt/bin:$PATH' >> $ENVIRONMENT
 
 # create startup helper script
 
-sed -e "/^%ENV%/r $ENVIRONMENT" -e '/^%ENV%/d' -e 's/%VER%/'"${release_version}"'/' < ardour.sh.in > $APPBIN/ardour${major_version}
-rm $ENVIRONMENT && chmod 775 $APPBIN/ardour${major_version}
+sed -e "/^%ENV%/r $ENVIRONMENT" -e '/^%ENV%/d' -e 's/%VER%/'"${release_version}"'/;s/%EXENAME%/${EXENAME}/' < ardour.sh.in > $APPBIN/${EXENAME}${major_version}
+rm $ENVIRONMENT && chmod 775 $APPBIN/${EXENAME}${major_version}
 MAIN_EXECUTABLE=ardour-${release_version}
 
 echo "Copying ardour executable ...."
-cp $BUILD_ROOT/gtk2_ardour/$MAIN_EXECUTABLE $APPBIN
+cp -v $BUILD_ROOT/gtk2_ardour/$MAIN_EXECUTABLE $APPBIN/${EXENAME}-${major_version}
 if test x$STRIP = xall ; then
-	strip $APPBIN/$MAIN_EXECUTABLE
+	strip $APPBIN/${EXENAME}-${major_version}
 fi
 
 # copy locale files
@@ -576,15 +578,21 @@ done
 ### Mixbus plugins, etc
 if test -n "$MIXBUS"; then
 
+	echo "Adding Mixbus LADSPA and LV2s"
+
 	mkdir -p $APPLIB/LV2
 	mkdir -p $APPLIB/ladspa/strip/
 
 	# TODO find a good way to cache those locally
-	curl -s -S -o "${CACHEDIR}/harrison_lv2s.${HARCH}.zip" \
+	curl -s -S \
+		-z "${CACHEDIR}/harrison_lv2s.${HARCH}.zip" \
+		-o "${CACHEDIR}/harrison_lv2s.${HARCH}.zip" \
 		http://www.harrisonconsoles.com/mixbus/mb3/${HARCH}/harrison_lv2s.zip 
-	unzip -d "$APPLIB/LV2/" "${CACHEDIR}/harrison_lv2s.${HARCH}.zip"
+	unzip -q -d "$APPLIB/LV2/" "${CACHEDIR}/harrison_lv2s.${HARCH}.zip"
 
-	curl -s -S -o $APPLIB/ladspa/strip/harrison_channelstrip.so \
+	curl -s -S \
+		-z $APPLIB/ladspa/strip/harrison_channelstrip.so \
+		-o $APPLIB/ladspa/strip/harrison_channelstrip.so \
 		http://www.harrisonconsoles.com/mixbus/mb3/${HARCH}/harrison_channelstrip.so
 
 	METERS_VERSION=$(curl -s -S http://gareus.org/x42/linux/x42-meters.latest.txt)
@@ -642,7 +650,7 @@ chmod a+x $APPBIN/${APP_VER_NAME}.uninstall.sh
 #
 # Add the stage2.run script
 #
-sed -e "s/%REPLACE_MAJOR_VERSION%/${major_version}/;s/%REPLACE_PGM%/${APPNAME}/;s/%REPLACE_VENDOR%/${VENDOR}/" < stage2.run.in > stage2.run
+sed -e "s/%REPLACE_MAJOR_VERSION%/${major_version}/;s/%REPLACE_PGM%/${APPNAME}/;s/%REPLACE_VENDOR%/${VENDOR}/;s/%REPLACE_EXE%/${EXENAME}/" < stage2.run.in > stage2.run
 chmod a+x stage2.run
 
 
diff --git a/tools/linux_packaging/stage2.run.in b/tools/linux_packaging/stage2.run.in
index 4894875ab5..a28fbf7991 100755
--- a/tools/linux_packaging/stage2.run.in
+++ b/tools/linux_packaging/stage2.run.in
@@ -12,7 +12,7 @@ MAJOR_VERSION="%REPLACE_MAJOR_VERSION%"
 
 PGM_NAME="%REPLACE_PGM%"
 PGM_VENDOR="%REPLACE_VENDOR%"
-PGM_EXEC_FILE="ardour${MAJOR_VERSION}"
+PGM_EXEC_FILE="$REPLACE_EXE%${MAJOR_VERSION}"
 
 THE_SHELL="/bin/sh"