From 94ba8baa25713b6b63c365467e60622bc56d84cf Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Thu, 2 Jul 2015 05:17:17 +0200 Subject: [PATCH] more early morning installer fixes --- tools/linux_packaging/build | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build index 8a1cebc498..c3f8281f82 100755 --- a/tools/linux_packaging/build +++ b/tools/linux_packaging/build @@ -239,12 +239,11 @@ 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}"'/;s/%EXENAME%/${EXENAME}/' < ardour.sh.in > $APPBIN/${EXENAME}${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 -v $BUILD_ROOT/gtk2_ardour/$MAIN_EXECUTABLE $APPBIN/${EXENAME}-${major_version} +cp -v $BUILD_ROOT/gtk2_ardour/ardour-${release_version} $APPBIN/${EXENAME}-${major_version} if test x$STRIP = xall ; then strip $APPBIN/${EXENAME}-${major_version} fi @@ -428,7 +427,7 @@ deplibs= while [ true ] ; do missing=false filelist=`find $APPLIB/ -type f` - filelist="$APPBIN/$MAIN_EXECUTABLE $filelist" + filelist="$APPBIN/${EXENAME}-${major_version} $filelist" for file in $filelist ; do if ! file $file | grep -qs ELF ; then