From 5a554bdaa7db39f5058ff236f57a8aa8bf72f469 Mon Sep 17 00:00:00 2001 From: Peter Eckersley Date: Wed, 2 Dec 2015 15:12:00 -0800 Subject: [PATCH] less confusing variable name --- tools/dev-release.sh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/tools/dev-release.sh b/tools/dev-release.sh index 4a169ab51..8bbe9e4f5 100755 --- a/tools/dev-release.sh +++ b/tools/dev-release.sh @@ -18,11 +18,10 @@ if [ "$1" = "--production" ] ; then if ! echo "$version" | grep -q -e '[0-9]\+.[0-9]\+.[0-9]\+' ; then echo "Version doesn't look like 1.2.3" fi - # XXX TODO rename to RELEASE_BRANCH once bmw isn't editing the same file - DEV_RELEASE_BRANCH="master" + RELEASE_BRANCH="master" else version="$version.dev$(date +%Y%m%d)1" - DEV_RELEASE_BRANCH="dev-release" + RELEASE_BRANCH="dev-release" echo Releasing developer version "$version"... fi @@ -63,8 +62,8 @@ echo "Cloning into fresh copy at $root" # clean repo = no artificats git clone . $root git rev-parse HEAD cd $root -git branch -f "$DEV_RELEASE_BRANCH" -git checkout "$DEV_RELEASE_BRANCH" +git branch -f "$RELEASE_BRANCH" +git checkout "$RELEASE_BRANCH" for pkg_dir in $SUBPKGS do