From d6d2ee7d19a43bede747d0d485fade69cb611e8d Mon Sep 17 00:00:00 2001 From: Girish Ramakrishnan Date: Sun, 28 Oct 2018 16:10:48 -0700 Subject: [PATCH] Add version to release filename This is required because we have to patch the VERSION file inside the tarball for 'rerelease'. Which then requires release tarballs to have a unique name. The version is at the end because there is code in release script which relies on the box sha at the front --- scripts/createReleaseTarball | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/createReleaseTarball b/scripts/createReleaseTarball index f46a9e3f0..c3872ddec 100755 --- a/scripts/createReleaseTarball +++ b/scripts/createReleaseTarball @@ -17,7 +17,6 @@ version="" while true; do case "$1" in - --output) bundle_file="$2"; shift 2;; --version) version="$2"; shift 2;; --) break;; *) echo "Unknown option $1"; exit 1;; @@ -50,7 +49,7 @@ box_version=$(cd "${SOURCE_DIR}" && git rev-parse "HEAD") branch=$(git rev-parse --abbrev-ref HEAD) dashboard_version=$(cd "${SOURCE_DIR}/../dashboard" && git fetch && git rev-parse "${branch}") bundle_dir=$(mktemp -d -t box 2>/dev/null || mktemp -d box-XXXXXXXXXX --tmpdir=$TMPDIR) -[[ -z "$bundle_file" ]] && bundle_file="${TMPDIR}/box-${box_version:0:10}-${dashboard_version:0:10}.tar.gz" +bundle_file="${TMPDIR}/box-${box_version:0:10}-${dashboard_version:0:10}-${version}.tar.gz" chmod "o+rx,g+rx" "${bundle_dir}" # otherwise extracted tarball director won't be readable by others/group echo "==> Checking out code box version [${box_version}] and dashboard version [${dashboard_version}] into ${bundle_dir}"