diff --git a/tools/build-system/launch-build-machine-2.sh b/tools/build-system/launch-build-machine-2.sh index 0d9a44088f2877ff972b74a6cf868143366fd350..85d0dd9e47027608bc9946abfcaacd701be8c8b2 100755 --- a/tools/build-system/launch-build-machine-2.sh +++ b/tools/build-system/launch-build-machine-2.sh @@ -131,8 +131,8 @@ if [ ${IS_KDE_CLIENT} ]; then PREVIOUS_VERSION=${PREVIOUS_RELEASE_TAG_NAME%.*} PREVIOUS_VERSION=${PREVIOUS_VERSION#*.} else - CURRENT_RELEASE_VERSION=${CURRENT_RELEASE_TAG_NAME%.*} - PREVIOUS_VERSION=${PREVIOUS_RELEASE_TAG_NAME%.*} + CURRENT_RELEASE_VERSION=${CURRENT_RELEASE_TAG_NAME} + PREVIOUS_VERSION=${PREVIOUS_RELEASE_TAG_NAME} fi cd ${LAUNCHPAD_DIR} @@ -143,11 +143,7 @@ SOFTWARE_VERSION="" LAUNCHPAD_CONF_PREFIX="" if [ ${IS_RELEASE} ]; then - VERSION_APPEND="" - if [ "${CURRENT_RELEASE_TYPE}" != "stable" ] ; then - VERSION_APPEND="~${CURRENT_RELEASE_TYPE}" - fi - SOFTWARE_VERSION="${CURRENT_RELEASE_VERSION}${VERSION_APPEND}" + SOFTWARE_VERSION="${CURRENT_RELEASE_VERSION}" COMMIT_HASH_BEGIN="${PREVIOUS_RELEASE_COMMIT_HASH}" LAUNCHPAD_CONF_PREFIX="sflphone" else