jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Do not require dashboard remote branch with the same name for hotfix

Browse Source
This commit is contained in:
Johannes Zellner
2018-09-12 12:54:59 +02:00
parent 812d3576a9
commit b2469de9b0
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/createReleaseTarball
+1 -5
View File
@@ -41,11 +41,7 @@ fi
box_version=$(cd "${SOURCE_DIR}" && git rev-parse "HEAD") box_version=$(cd "${SOURCE_DIR}" && git rev-parse "HEAD")
branch=$(git rev-parse --abbrev-ref HEAD) branch=$(git rev-parse --abbrev-ref HEAD)
if [[ "${branch}" == "master" ]]; then dashboard_version=$(cd "${SOURCE_DIR}/../dashboard" && git rev-parse "master")
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) 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" [[ -z "$bundle_file" ]] && bundle_file="${TMPDIR}/box-${box_version:0:10}-${dashboard_version:0:10}.tar.gz"