From 19cc538c2a113bed82084598e74712af738e7766 Mon Sep 17 00:00:00 2001 From: Patrick Vacek Date: Mon, 13 Jul 2020 16:31:32 +0200 Subject: [PATCH] make_src_archive.sh: Fix a bug if submodules weren't checked out. Also upgrade git_archive_all to 1.21.0 to fix some warnings. Signed-off-by: Patrick Vacek --- scripts/make_src_archive.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/make_src_archive.sh b/scripts/make_src_archive.sh index 133b7a48b9..db8ef01cdb 100755 --- a/scripts/make_src_archive.sh +++ b/scripts/make_src_archive.sh @@ -7,12 +7,14 @@ SCRIPTS_DIR=$(readlink -f "$(dirname "$0")") OUTPUT=$(realpath "$1") REPO=$(realpath "${2:-.}") +# Just in case this wasn't done before. +git -C "$REPO" submodule update --init --recursive + python3 -m venv venv . venv/bin/activate -# pip install 'git_archive_all==1.19.4' -pip install git+https://github.com/Kentzo/git-archive-all@1f7938cd6db76bfcf7eb1046ccb818df72b141ad +pip install 'git_archive_all==1.21.0' TMPDIR=$(mktemp -d) trap 'rm -rf $TMPDIR' EXIT