diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2010-11-02 12:01:42 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2010-11-02 12:01:42 +0000 |
| commit | 14e57c73119b554e7e31238a95b80bfc9843f74c (patch) | |
| tree | fd6fa374d5dd1386562a52bb6ad0b421293cf0c0 | |
| parent | 9777d3fa4739eb3fae839f6ba6699d3dedfe8cd5 (diff) | |
| download | rabbitmq-server-bug23354.tar.gz | |
The tarballs are not both in the same dir! Also, move bashism out to a bash script (I'm not sure we can live without it).bug23354
| -rw-r--r-- | packaging/macports/Makefile | 19 | ||||
| -rwxr-xr-x | packaging/macports/make-checksums.sh | 14 |
2 files changed, 20 insertions, 13 deletions
diff --git a/packaging/macports/Makefile b/packaging/macports/Makefile index 61a1e910..ee79c95a 100644 --- a/packaging/macports/Makefile +++ b/packaging/macports/Makefile @@ -1,8 +1,9 @@ -TARBALL_DIR=../../dist -TARBALL_SRC=$(notdir $(wildcard $(TARBALL_DIR)/rabbitmq-server-[0-9.]*.tar.gz)) -TARBALL_BIN=$(notdir $(wildcard $(TARBALL_DIR)/rabbitmq-server-generic-unix-[0-9.]*.tar.gz)) +TARBALL_SRC_DIR=../../dist +TARBALL_BIN_DIR=../../packaging/generic-unix/ +TARBALL_SRC=$(wildcard $(TARBALL_SRC_DIR)/rabbitmq-server-[0-9.]*.tar.gz) +TARBALL_BIN=$(wildcard $(TARBALL_BIN_DIR)/rabbitmq-server-generic-unix-[0-9.]*.tar.gz) COMMON_DIR=../common -VERSION=$(shell echo $(TARBALL) | sed -e 's:rabbitmq-server-\(.*\)\.tar\.gz:\1:g') +VERSION=$(shell echo $(TARBALL_SRC) | sed -e 's:rabbitmq-server-\(.*\)\.tar\.gz:\1:g') # The URL at which things really get deployed REAL_WEB_URL=http://www.rabbitmq.com/ @@ -24,15 +25,7 @@ dirs: mkdir -p $(DEST)/files $(DEST)/Portfile: Portfile.in - tarball_src=$(TARBALL_SRC) ; \ - tarball_bin=$(TARBALL_BIN) ; \ - for type in src bin ; do \ - tarball_var=tarball_$${type} ; \ - tarball=$${!tarball_var} ; \ - for algo in md5 sha1 rmd160 ; do \ - checksum=$$(openssl $$algo $(TARBALL_DIR)/$${tarball} | awk '{print $$NF}') ; \ - echo "s|@$$algo-$$type@|$$checksum|g" ; \ - done ; done >checksums.sed + ./make-checksums.sh $(TARBALL_SRC) $(TARBALL_BIN) > checksums.sed sed -e "s|@VERSION@|$(VERSION)|g;s|@BASE_URL@|$(REAL_WEB_URL)|g" \ -f checksums.sed <$^ >$@ rm checksums.sed diff --git a/packaging/macports/make-checksums.sh b/packaging/macports/make-checksums.sh new file mode 100755 index 00000000..11424dfc --- /dev/null +++ b/packaging/macports/make-checksums.sh @@ -0,0 +1,14 @@ +#!/bin/bash +# NB: this script requires bash +tarball_src=$1 +tarball_bin=$2 +for type in src bin +do + tarball_var=tarball_${type} + tarball=${!tarball_var} + for algo in md5 sha1 rmd160 + do + checksum=$(openssl $algo ${tarball} | awk '{print $NF}') + echo "s|@$algo-$type@|$checksum|g" + done +done |