github-mirrors/logstash
1
0
Fork 0
mirror of https://github.com/elastic/logstash.git synced 2025-04-24 22:57:16 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #781 from logstash/LOGSTASH-1588-fix-packages

Browse source 
- fetch the version from .VERSION.mk
This commit is contained in:
Jordan Sissel 2013-11-18 14:13:01 -08:00
commit 6ed259eedc
1 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
pkg/build.sh
View file

@ -1,7 +1,9 @@
#!/bin/bash #!/bin/bash
VERSION="$(awk -F\" '/LOGSTASH_VERSION/ {print $2}' $(dirname $0)/../lib/logstash/version.rb)" [ ! -f ../.VERSION.mk ] && make -C .. .VERSION.mk
. ../.VERSION.mk
if [ "$#" -ne 2 ] ; then if [ "$#" -ne 2 ] ; then
echo "Usage: $0 <os> <release>" echo "Usage: $0 <os> <release>"
@ -101,13 +103,8 @@ case $os in
VERSION="$(echo $VERSION | sed 's/\.\(dev\|rc.*\)/~\1/')" VERSION="$(echo $VERSION | sed 's/\.\(dev\|rc.*\)/~\1/')"
fi fi
if ! git show-ref --tags | grep -q "$(git rev-parse HEAD)"; then
# HEAD is not tagged, add the date, time and commit hash to the revision
REVISION="+$(date -u +%Y%m%d%H%M)~$(git rev-parse --short HEAD)"
fi
fpm -s dir -t deb -n logstash -v "$VERSION" \ fpm -s dir -t deb -n logstash -v "$VERSION" \
-a all --iteration "${os}1${REVISION}" \ -a all --iteration "${os}1" \
--url "http://logstash.net" \ --url "http://logstash.net" \
--description "An extensible logging pipeline" \ --description "An extensible logging pipeline" \
-d "java6-runtime-headless | java7-runtime-headless" \ -d "java6-runtime-headless | java7-runtime-headless" \