From 7232c01a8061872b713197f80d11ed16bc3a8bc3 Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 26 Apr 2018 12:07:02 +0100 Subject: [PATCH 1/2] Fix args in the release wrapper script It was assuming the version was always $1 which meant there was no way to pass options (eg. -x to skip changelog generation) through to the underlying release script without breaking the wrapper script. --- release.sh | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/release.sh b/release.sh index 136750181e..f11d68de78 100755 --- a/release.sh +++ b/release.sh @@ -7,6 +7,15 @@ set -e +orig_args=$@ + +# chomp any args starting with '-' as these need to go +# through to the rleease script and otherwise we'll get +# confused about what the version arg is. +while [[ "$1" == -* ]]; do + shift +done + cd `dirname $0` for i in matrix-js-sdk matrix-react-sdk @@ -38,4 +47,4 @@ git commit package.json -m "$tag" cd .. -exec ./node_modules/matrix-js-sdk/release.sh -z "$@" +exec ./node_modules/matrix-js-sdk/release.sh -z "$orig_args" From d5a07a446d37939b897a674ac97fceb61963b6de Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 26 Apr 2018 12:55:12 +0100 Subject: [PATCH 2/2] typo --- release.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release.sh b/release.sh index f11d68de78..b5bdb010ce 100755 --- a/release.sh +++ b/release.sh @@ -10,7 +10,7 @@ set -e orig_args=$@ # chomp any args starting with '-' as these need to go -# through to the rleease script and otherwise we'll get +# through to the release script and otherwise we'll get # confused about what the version arg is. while [[ "$1" == -* ]]; do shift