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

createReleaseTarball: Make sure we pick the current branch on webadmin

Browse Source
This commit is contained in:
Girish Ramakrishnan
2018-02-06 16:18:42 -08:00
parent 6b55d7585c
commit 5be39bc271
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/createReleaseTarball
View File

@@ -40,7 +40,8 @@ if [[ "$(node --version)" != "v8.9.3" ]]; then
fi fi
box_version=$(cd "${SOURCE_DIR}" && git rev-parse "HEAD") 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) 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" [[ -z "$bundle_file" ]] && bundle_file="${TMPDIR}/box-${box_version:0:10}-${webadmin_version:0:10}.tar.gz"