Merge branch 'f37' into f36

This commit is contained in:
Jiri Vanek 2023-05-11 13:49:22 +02:00
commit 05120c1840
1 changed files with 16 additions and 15 deletions

View File

@ -143,7 +143,7 @@ pushd "${FILE_NAME_ROOT}"
# Remove commit checks # Remove commit checks
echo "Removing $(find openjdk -name '.jcheck' -print)" echo "Removing $(find openjdk -name '.jcheck' -print)"
find openjdk -name '.jcheck' -print0 | xargs -0 rm -r find openjdk -name '.jcheck' -print0 | xargs -0 rm -rf
# Remove history and GHA # Remove history and GHA
echo "find openjdk -name '.hgtags'" echo "find openjdk -name '.hgtags'"
@ -165,7 +165,8 @@ pushd "${FILE_NAME_ROOT}"
else else
SWITCH=czf SWITCH=czf
fi fi
tar --exclude-vcs -$SWITCH ${FILE_NAME_ROOT}.tar.${COMPRESSION} $TO_COMPRESS TARBALL_NAME=${FILE_NAME_ROOT}.tar.${COMPRESSION}
mv ${FILE_NAME_ROOT}.tar.${COMPRESSION} .. tar --exclude-vcs -$SWITCH ${TARBALL_NAME} $TO_COMPRESS
mv ${TARBALL_NAME} ..
popd popd
echo "Done. You may want to remove the uncompressed version - $FILE_NAME_ROOT." echo "Done. You may want to remove the uncompressed version - $FILE_NAME_ROOT."