change extraction of revision and build from revision.cc, and use in the build, packa...

diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build
index 8b692de74ec5189bb811f94033ca39c9d0936c60..c1d770bfe60b76fb483d30d5fb6a7d92981ada47 100755 (executable)
--- a/tools/linux_packaging/build
+++ b/tools/linux_packaging/build
@@ -88,7 +88,7 @@ if test x$STRIP != xall -a x$STRIP != xnone -a x$STRIP != xsome ; then
 fi
 
 release_version=`grep -m 1 '[^A-Za-z_]LINUX_VERSION = ' ../../wscript | awk '{ print $3 }' | sed "s/'//g"`
-revision=`grep -m 1 'revision =' ../../libs/ardour/revision.cc | cut -d'"' -f 2`
+revision=`grep -m 1 'revision =' ../../libs/ardour/revision.cc | cut -d'"' -f 2 | sed -e "s/$release_version//"`
 echo "Version is $release_version / $revision"
 info_string="$release_version/$revision built on `hostname` by `whoami` on `date`"
 echo "Info string is $info_string"

diff --git a/tools/linux_packaging/package b/tools/linux_packaging/package
index 85cac2ed9807a8333a8deb383bb2784f1c89e2c5..4862f285ab414cd3004bd4884c5674d472a9fe6c 100755 (executable)
--- a/tools/linux_packaging/package
+++ b/tools/linux_packaging/package
@@ -63,10 +63,10 @@ if [ x$DEBUG = xT ]; then
 fi
 
 release_version=`grep -m 1 '[^A-Za-z_]LINUX_VERSION = ' ../../wscript | awk '{print $3}' | sed "s/'//g"`
-revision=`grep -m 1 'revision =' ../../libs/ardour/revision.cc | cut -d'"' -f 2`
+revision=`grep -m 1 'revision =' ../../libs/ardour/revision.cc | cut -d'"' -f 2 | sed -e "s/$release_version//"`
 
-X86_BUNDLE="${APPNAME}_x86-${release_version}_${revision}"
-X86_64_BUNDLE="${APPNAME}_x86_64-${release_version}_${revision}"
+X86_BUNDLE="${APPNAME}_x86-${release_version}-${revision}"
+X86_64_BUNDLE="${APPNAME}_x86_64-${release_version}-${revision}"
 
 if [ ! -z ${BUILDTYPE} ]; then
        X86_BUNDLE="${X86_BUNDLE}-${BUILDTYPE}"

diff --git a/tools/linux_packaging/uninstall.sh.in b/tools/linux_packaging/uninstall.sh.in
index b1e4f3cec3391e13b18d9a201c2ecf107e1804dc..74793d419784d503acb36575f45e3572f34a7edf 100644 (file)
--- a/tools/linux_packaging/uninstall.sh.in
+++ b/tools/linux_packaging/uninstall.sh.in
@@ -24,12 +24,12 @@ USER_NAME=$(logname)
 
 #### Derived Variables ####
 if [ -z "${PGM_BUILDTYPE}" ]; then
-       PGM_PATH=${INSTALL_DEST_BASE}/${PGM_NAME}-${PGM_VERSION}_${PGM_BUILD}
+       PGM_PATH=${INSTALL_DEST_BASE}/${PGM_NAME}-${PGM_VERSION}-${PGM_BUILD}
        ICON_NAME="${PGM_VENDOR}-${PGM_NAME}_${PGM_VERSION}"                    #no dash between name and version since dash seperates vendor from program
        MENU_FILE="${PGM_VENDOR}-${PGM_NAME}_${PGM_VERSION}.desktop"    #no dash between name and version since dash seperates vendor from program
        DESKTOP_LINK_FILE="${PGM_NAME}_${PGM_VERSION}.desktop"
 else
-       PGM_PATH=${INSTALL_DEST_BASE}/${PGM_NAME}-${PGM_VERSION}_${PGM_BUILD}-${PGM_BUILDTYPE}
+       PGM_PATH=${INSTALL_DEST_BASE}/${PGM_NAME}-${PGM_VERSION}-${PGM_BUILD}-${PGM_BUILDTYPE}
        ICON_NAME="${PGM_VENDOR}-${PGM_NAME}_${PGM_VERSION}_${PGM_BUILDTYPE}"                   #no dash between name and version since dash seperates vendor from program
        MENU_FILE="${PGM_VENDOR}-${PGM_NAME}_${PGM_VERSION}_${PGM_BUILDTYPE}.desktop"   #no dash between name and version since dash seperates vendor from program
        DESKTOP_LINK_FILE="${PGM_NAME}_${PGM_VERSION}_${PGM_BUILDTYPE}.desktop"