aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2018-08-15 10:03:37 +0200
committerLukas Larsson <[email protected]>2018-08-15 10:03:37 +0200
commit621cf67c97c89e18399ec6a21dde2c6275493b5e (patch)
treecf73c76c20448047e9922af95957130544bc7600
parent240e1c58958ff0429b54f1e237ed989efe0adc49 (diff)
parent3cbcda5b638100f243282c5ef491ac093f41740b (diff)
downloadotp-621cf67c97c89e18399ec6a21dde2c6275493b5e.tar.gz
otp-621cf67c97c89e18399ec6a21dde2c6275493b5e.tar.bz2
otp-621cf67c97c89e18399ec6a21dde2c6275493b5e.zip
Merge branch 'lukas/travis/deploy' into maint
* lukas/travis/deploy: travis: Make bundle version select regexp stricter
-rwxr-xr-xscripts/bundle-otp8
1 files changed, 7 insertions, 1 deletions
diff --git a/scripts/bundle-otp b/scripts/bundle-otp
index 87b3b90a25..aa1f166732 100755
--- a/scripts/bundle-otp
+++ b/scripts/bundle-otp
@@ -13,6 +13,9 @@ REPOSITORIES="otp,$TRAVIS_TAG corba,.*"
mkdir bundle
+## Turn off * expansion, needed for the .* regexp to work
+set -f
+
for repo in $REPOSITORIES; do
OLD_IFS=$IFS
IFS=','
@@ -22,13 +25,16 @@ for repo in $REPOSITORIES; do
git clone https://github.com/erlang/$1 $1
cd $1
echo $1 $2
- TAG=`git tag -l | grep -v "\-rc" | grep -P "$2" | sort -V | tail -1`
+ TAG=`git tag -l | grep -P "^$2$" | sort -V | tail -1`
git checkout $TAG
SHA=`git rev-parse --verify HEAD`
rm -rf .git
echo "$1 $TAG $SHA" >> $OTP_META_FILE
done
+## Turn on * expansion
+set +f
+
cd $ERL_TOP/bundle/
tar czf $OTP_FILE *