Merge pull request #1721 from advancedtelematic/fix/make-src-archive

make_src_archive.sh: Fix a bug if submodules weren't checked out.
advancedtelematic · Jul 14, 2020 · 6091708 · 6091708
2 parents 4169157 + 19cc538
commit 6091708
Showing 1 changed file with 4 additions and 2 deletions.
diff --git 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