From 84150f53e726b3ac7ca1f57829d51a8a0914f38b Mon Sep 17 00:00:00 2001
From: Girish Ramakrishnan <girish@cloudron.io>
Date: Wed, 26 Sep 2018 22:03:38 -0700
Subject: [PATCH] Revert "Do not require dashboard remote branch with the same
 name for hotfix"

This reverts commit b2469de9b05d7ef920254e7625bbfb087e53cb26.

This affects the release scripts and always creates dashboard tarball from master
---
 scripts/createReleaseTarball | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/scripts/createReleaseTarball b/scripts/createReleaseTarball
index 6fed766b0..df841f077 100755
--- a/scripts/createReleaseTarball
+++ b/scripts/createReleaseTarball
@@ -41,7 +41,11 @@ fi
 
 box_version=$(cd "${SOURCE_DIR}" && git rev-parse "HEAD")
 branch=$(git rev-parse --abbrev-ref HEAD)
-dashboard_version=$(cd "${SOURCE_DIR}/../dashboard" && git rev-parse "master")
+if [[ "${branch}" == "master" ]]; then
+    dashboard_version=$(cd "${SOURCE_DIR}/../dashboard" && git rev-parse "${branch}")
+else
+    dashboard_version=$(cd "${SOURCE_DIR}/../dashboard" && git fetch && git rev-parse "origin/${branch}")
+fi
 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"