From e18cebd6d716d5a24960eb0c834db6a22cc2d67f Mon Sep 17 00:00:00 2001 From: Todd Naugle Date: Fri, 25 Feb 2011 22:05:15 +0000 Subject: merge in changes from 2.0 ongoing. Includes the build type in the package name and other fixes from 2.0 git-svn-id: svn://localhost/ardour2/branches/3.0@8962 d708f5d6-7413-0410-9779-e7cbd77b26cf --- tools/linux_packaging/uninstall.sh.in | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'tools/linux_packaging/uninstall.sh.in') diff --git a/tools/linux_packaging/uninstall.sh.in b/tools/linux_packaging/uninstall.sh.in index 0e15b3d02c..468a4035fa 100644 --- a/tools/linux_packaging/uninstall.sh.in +++ b/tools/linux_packaging/uninstall.sh.in @@ -12,16 +12,24 @@ PGM_NAME="%REPLACE_PGM%" PGM_VENDOR="%REPLACE_VENDOR%" PGM_VERSION="%REPLACE_VERSION%" PGM_BUILD="%REPLACE_BUILD%" +PGM_BUILDTYPE="%REPLACE_TYPE%" INSTALL_DEST_BASE=/opt #### Derived Variables #### -PGM_PATH=${INSTALL_DEST_BASE}/${PGM_NAME}-${PGM_VERSION}_${PGM_BUILD} +if [ -z "${PGM_BUILDTYPE}" ]; then + 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} + 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" +fi -ICON_NAME="${PGM_VENDOR}-${PGM_NAME}_${PGM_VERSION}" #no dash between name and version since seperates vendor from program -MENU_FILE="${PGM_VENDOR}-${PGM_NAME}_${PGM_VERSION}.desktop" #no dash between name and version since seperates vendor from program -DESKTOP_LINK_FILE="${PGM_NAME}_${PGM_VERSION}.desktop" MENU_FILE_PATH="${PGM_PATH}/share/${MENU_FILE}" @@ -76,7 +84,7 @@ then # delete the old package sudo rm -rf ${PGM_PATH} - sudo rm -f $0 + sudo rm -f $0 else echo "" echo "!!! FAILURE !!! - install path ${PGM_PATH} does not exist." -- cgit v1.2.3