Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
savoirfairelinux
jami-daemon
Commits
7732cb16
Commit
7732cb16
authored
Oct 05, 2011
by
Alexandre Savard
Browse files
#7046: Fix launch-build-machine script for 1.X.X software version
parent
333a6d58
Changes
1
Hide whitespace changes
Inline
Side-by-side
tools/build-system/launch-build-machine-2.sh
View file @
7732cb16
...
...
@@ -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
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment