Add some lua scripts

[ardour.git] / tools / linux_packaging / uninstall.sh.in

diff --git a/tools/linux_packaging/uninstall.sh.in b/tools/linux_packaging/uninstall.sh.in
index b1e4f3cec3391e13b18d9a201c2ecf107e1804dc..606a28fd475ff9c7dc7167e5c741cdac31d74e7c 100644 (file)
--- a/tools/linux_packaging/uninstall.sh.in
+++ b/tools/linux_packaging/uninstall.sh.in
@@ -7,11 +7,11 @@
 #
 #####################################
 
+MAJOR_VERSION="%REPLACE_MAJOR_VERSION%"
 
 PGM_NAME="%REPLACE_PGM%"
 PGM_VENDOR="%REPLACE_VENDOR%"
 PGM_VERSION="%REPLACE_VERSION%"
-PGM_BUILD="%REPLACE_BUILD%"
 PGM_BUILDTYPE="%REPLACE_TYPE%"
 
 INSTALL_DEST_BASE=/opt
@@ -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}
        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_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"
@@ -68,6 +68,8 @@ if [ "$(id -u)" != "0" ]; then
                        exit 1
                fi
                exit
+       else
+               sudo -k # make sudo forget about cached credentials
        fi
 
        if ! sudo date;
@@ -146,6 +148,7 @@ then
                ${SUPER} xdg-icon-resource uninstall --size 22 ${ICON_NAME}
                ${SUPER} xdg-icon-resource uninstall --size 32 ${ICON_NAME}
                ${SUPER} xdg-icon-resource uninstall --size 48 ${ICON_NAME}
+               ${SUPER} xdg-icon-resource uninstall --size 256 ${ICON_NAME}
 
                if [ -e /usr/share/icons/hicolor/scalable/apps/${ICON_NAME}.svg ]; 
                then
@@ -159,14 +162,14 @@ then
        fi
 
        # delete the bin link if it is linked to this version
-       if [ -e "${USER_BIN_DIR}/${PGM_NAME}3" ]; 
+       if [ -e "${USER_BIN_DIR}/${PGM_NAME}${MAJOR_VERSION}" ]; 
        then
-               BIN_LINK_TARGET=$(readlink "${USER_BIN_DIR}/${PGM_NAME}3")
+               BIN_LINK_TARGET=$(readlink "${USER_BIN_DIR}/${PGM_NAME}${MAJOR_VERSION}")
                BIN_LINK_TARGET_DIR=$(dirname "${BIN_LINK_TARGET}")
 
                if [ "${BIN_LINK_TARGET_DIR}" = "${PGM_PATH}/bin" ];
                then
-                       ${SUPER} rm -f "${USER_BIN_DIR}/${PGM_NAME}3"
+                       ${SUPER} rm -f "${USER_BIN_DIR}/${PGM_NAME}${MAJOR_VERSION}"
                fi
        fi