diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-03-24 17:01:21 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-03-24 17:01:21 -0400 |
| commit | cf98b72c23396747d85d67e921ebc5a49061262b (patch) | |
| tree | 7be5f2ec4f18887dc46a78e6dcaa9ba77ec87320 /tools | |
| parent | 327685610536bf1c008deace0fb335dd829bdc66 (diff) | |
more packaging name fixes
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/linux_packaging/stage2.run | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/linux_packaging/stage2.run b/tools/linux_packaging/stage2.run index 2bed7fa5fb..3541cf02c2 100755 --- a/tools/linux_packaging/stage2.run +++ b/tools/linux_packaging/stage2.run @@ -371,18 +371,18 @@ fi ################################ # Setup derived variables ################################ -PGM_VERSION=$(echo ${BUNDLE_DIR} | awk 'BEGIN { FS = "-" } ; { print $2 }' | awk 'BEGIN { FS = "_"} ; { print $1}') -PGM_BUILD=$(echo ${BUNDLE_DIR} | awk 'BEGIN { FS = "-" } ; { print $2 }' | awk 'BEGIN { FS = "_"} ; { print $2}') +PGM_VERSION=$(echo ${BUNDLE_DIR} | awk 'BEGIN { FS = "-" } ; { print $2 }') +PGM_BUILD=$(echo ${BUNDLE_DIR} | awk 'BEGIN { FS = "-" } ; { print $3 }') PGM_BUILDTYPE=$(echo ${BUNDLE_DIR} | awk 'BEGIN { FS = "-" } ; { print $3 }') if [ -z ${PGM_BUILDTYPE} ]; then - PGM_FULL_NAME="${PGM_NAME}-${PGM_VERSION}_${PGM_BUILD}" + PGM_FULL_NAME="${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_FULL_NAME="${PGM_NAME}-${PGM_VERSION}_${PGM_BUILD}-${PGM_BUILDTYPE}" + PGM_FULL_NAME="${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" |