diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-03-25 10:39:00 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-03-25 10:39:00 -0400 |
| commit | 43b09fdd9a922aacf9eaa49075b86156735ae41c (patch) | |
| tree | 1c31d7549697cb2ffc97d8e0d8c6433fe8791e29 /tools | |
| parent | 03572e8454ab0d3e3d2f43dfc75e931d95f56ed7 (diff) | |
remove notion of BUILD from build and uninstall scripts
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/linux_packaging/build | 2 | ||||
| -rw-r--r-- | tools/linux_packaging/uninstall.sh.in | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build index df78bc27f8..a78d72a809 100755 --- a/tools/linux_packaging/build +++ b/tools/linux_packaging/build @@ -528,7 +528,7 @@ done # # Add the uninstaller # -sed -e "s/%REPLACE_PGM%/${APPNAME}/" -e "s/%REPLACE_VENDOR%/${VENDOR}/" -e "s/%REPLACE_VERSION%/${version}/" -e "s/%REPLACE_BUILD%/${commit}/" -e "s/%REPLACE_TYPE%/${BUILDTYPE}/" < uninstall.sh.in > $APPBIN/${APP_VER_NAME}.uninstall.sh +sed -e "s/%REPLACE_PGM%/${APPNAME}/" -e "s/%REPLACE_VENDOR%/${VENDOR}/" -e "s/%REPLACE_VERSION%/${version}/" -e "s/%REPLACE_TYPE%/${BUILDTYPE}/" < uninstall.sh.in > $APPBIN/${APP_VER_NAME}.uninstall.sh chmod a+x $APPBIN/${APP_VER_NAME}.uninstall.sh #Sanity Check file diff --git a/tools/linux_packaging/uninstall.sh.in b/tools/linux_packaging/uninstall.sh.in index 74793d4197..795c5d317d 100644 --- a/tools/linux_packaging/uninstall.sh.in +++ b/tools/linux_packaging/uninstall.sh.in @@ -11,7 +11,6 @@ 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 +23,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" |