Merge branch 'release' into Basilisk-releasev2020.01.12

1 files changed, 11 insertions, 7 deletions

diff --git a/modules/brotli/update.sh b/modules/brotli/update.sh
index 285f7dd5d..4a98ce6a7 100755
--- a/modules/brotli/update.sh
+++ b/modules/brotli/update.sh
@@ -1,21 +1,25 @@
 #!/bin/sh
 
-# Script to update the mozilla in-tree copy of the Brotli decompressor.
+# Script to update the mozilla in-tree copy of the Brotli library.
 # Run this within the /modules/brotli directory of the source tree.
 
 MY_TEMP_DIR=`mktemp -d -t brotli_update.XXXXXX` || exit 1
 
 git clone https://github.com/google/brotli ${MY_TEMP_DIR}/brotli
+git -C ${MY_TEMP_DIR}/brotli checkout v1.0.7
 
-COMMIT=`(cd ${MY_TEMP_DIR}/brotli && git log | head -n 1)`
-perl -p -i -e "s/\[commit [0-9a-f]{40}\]/[${COMMIT}]/" README.mozilla;
+COMMIT=$(git -C ${MY_TEMP_DIR}/brotli rev-parse HEAD)
+perl -p -i -e "s/\[commit [0-9a-f]{40}\]/[commit ${COMMIT}]/" README.mozilla;
 
-rm -rf dec
-mv ${MY_TEMP_DIR}/brotli/dec dec
+DIRS="common dec enc include tools"
+
+for d in $DIRS; do
+	rm -rf $d
+	mv ${MY_TEMP_DIR}/brotli/c/$d $d
+done
 rm -rf ${MY_TEMP_DIR}
-hg add dec
 
 echo "###"
-echo "### Updated brotli/dec to $COMMIT."
+echo "### Updated brotli to $COMMIT."
 echo "### Remember to verify and commit the changes to source control!"
 echo "###"