jami/jami-daemon
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-daemon.git synced 2025-08-12 22:09:25 +08:00
Code Issues Projects Releases Wiki Activity

#7046: Fix launch-build-machine script for 1.X.X software version

Browse Source
This commit is contained in:
Alexandre Savard
2011-10-05 18:49:14 -04:00
parent 333a6d584b
commit 7732cb167d
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tools/build-system/launch-build-machine-2.sh
View File

@ -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