From 5be39bc271510a95a4e34f0fa4e72ffbd5daa7cf Mon Sep 17 00:00:00 2001
From: Girish Ramakrishnan <girish@cloudron.io>
Date: Tue, 6 Feb 2018 16:18:42 -0800
Subject: [PATCH] createReleaseTarball: Make sure we pick the current branch on
 webadmin

---
 scripts/createReleaseTarball | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/createReleaseTarball b/scripts/createReleaseTarball
index c3ef5d556..048133601 100755
--- a/scripts/createReleaseTarball
+++ b/scripts/createReleaseTarball
@@ -40,7 +40,8 @@ if [[ "$(node --version)" != "v8.9.3" ]]; then
 fi
 
 box_version=$(cd "${SOURCE_DIR}" && git rev-parse "HEAD")
-webadmin_version=$(cd "${SOURCE_DIR}/../webadmin" && git rev-parse "HEAD")
+branch=$(git rev-parse --abbrev-ref HEAD)
+webadmin_version=$(cd "${SOURCE_DIR}/../webadmin" && git fetch && git rev-parse "origin/${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}-${webadmin_version:0:10}.tar.gz"