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
This commit is contained 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."
|
||||
|
||||
Reference in New Issue
Block a user