diff --git a/scripts/createReleaseTarball b/scripts/createReleaseTarball index 78396295c..ac71cb370 100755 --- a/scripts/createReleaseTarball +++ b/scripts/createReleaseTarball @@ -35,13 +35,14 @@ if [[ "$(node --version)" != "v8.9.3" ]]; then fi version=$(cd "${SOURCE_DIR}" && git rev-parse "HEAD") +webadmin_version=$(cd "${SOURCE_DIR}/../webadmin" && git rev-parse "HEAD") bundle_dir=$(mktemp -d -t box 2>/dev/null || mktemp -d box-XXXXXXXXXX --tmpdir=$TMPDIR) [[ -z "$bundle_file" ]] && bundle_file="${TMPDIR}/box-${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 [${version}] into ${bundle_dir}" +echo "Checking out code box version [${version}] and webadmin version [${webadmin_version}] into ${bundle_dir}" (cd "${SOURCE_DIR}" && git archive --format=tar ${version} | (cd "${bundle_dir}" && tar xf -)) -(cd "${SOURCE_DIR}/../webadmin" && git archive --format=tar ${version} | (cd "${bundle_dir}" && tar xf -)) +(cd "${SOURCE_DIR}/../webadmin" && git archive --format=tar ${webadmin_version} | (cd "${bundle_dir}" && tar xf -)) if diff "${TMPDIR}/boxtarball.cache/package-lock.json.all" "${bundle_dir}/package-lock.json" >/dev/null 2>&1; then echo "Reusing dev modules from cache"