Fix unpack directory of source tarball

This commit is contained in:
Emil Lundberg 2018-02-05 10:34:34 +01:00
parent 4373dec917
commit c320d0a221
No known key found for this signature in database
GPG Key ID: 5B9688125FF0B636

View File

@ -30,8 +30,9 @@ version=$(python3 compute-version.py "${PROJECT_NAME}"-)
commit=$(git rev-parse --short HEAD)
archive_name="archive-${commit}.tar.gz"
output_archive_base_name="${1:-${PROJECT_NAME}}"
output_archive_dir="${OUTPUT_DIR}/${output_archive_base_name}"
output_archive_name="${output_archive_base_name}-${version}.tar.gz"
output_archive_name="${output_archive_base_name}-${version}"
output_archive_dir="${OUTPUT_DIR}/${output_archive_name}"
output_archive_file_name="${output_archive_name}.tar.gz"
mkdir -p "${SUBMODULES_DIR}"
mkdir -p "${output_archive_dir}"
@ -69,8 +70,8 @@ for submodule_line in $(git submodule status --recursive); do
done
# Bundle all sources together
tar cf "${output_archive_name}" -C "${OUTPUT_DIR}" .
tar cf "${output_archive_file_name}" -C "${OUTPUT_DIR}" .
echo "Wrote ${output_archive_name}"
echo "Wrote ${output_archive_file_name}"
cleanup