diff options
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/linux_packaging/stage2.run | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/tools/linux_packaging/stage2.run b/tools/linux_packaging/stage2.run index 237f0ac93c..4f92ac5f4c 100755 --- a/tools/linux_packaging/stage2.run +++ b/tools/linux_packaging/stage2.run @@ -372,18 +372,16 @@ fi # Setup derived variables ################################ PGM_VERSION=$(echo ${BUNDLE_DIR} | cut -d- -f2) -PGM_BUILD=$(echo ${BUNDLE_DIR} | cut -d- -f3) -PGM_BUILDTYPE=$(echo ${BUNDLE_DIR} | cut -d- -f4) - +PGM_BUILDTYPE=$(echo ${BUNDLE_DIR} | cut -d- -f3) if [ -z ${PGM_BUILDTYPE} ]; then - PGM_FULL_NAME="${PGM_NAME}-${PGM_VERSION}-${PGM_BUILD}" + PGM_FULL_NAME="${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_FULL_NAME="${PGM_NAME}-${PGM_VERSION}-${PGM_BUILD}-${PGM_BUILDTYPE}" + PGM_FULL_NAME="${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" @@ -393,8 +391,6 @@ PGM_EXEC_PATH="${INSTALL_DEST_BASE}/${PGM_FULL_NAME}/bin/${PGM_EXEC_FILE}" ICON_PATH="${INSTALL_DEST_BASE}/${PGM_FULL_NAME}/share/icons" MENU_FILE_PATH="${INSTALL_DEST_BASE}/${PGM_FULL_NAME}/share" -echo "VERSION [$PGM_VERSION] BUILD [$BUILD] FULLNAME[$PGM_FULL_NAME] EXECPATH [$PGM_EXEC_PATH]" - ################################ # Install bundle and Menu/Link ################################ @@ -424,7 +420,7 @@ fi # install echo "" -echo "Installing ${PGM_NAME} ${PGM_VERSION} built from ${PGM_BUILD} in ${INSTALL_DEST_BASE}" +echo "Installing ${PGM_NAME} ${PGM_VERSION} in ${INSTALL_DEST_BASE}" echo "" # Copy the new version in the install directory |