diff --git a/libraries/source/fcollada/build.sh b/libraries/source/fcollada/build.sh index 2e42ba4647..75de15514e 100755 --- a/libraries/source/fcollada/build.sh +++ b/libraries/source/fcollada/build.sh @@ -6,13 +6,27 @@ set -e cd "$(dirname "$0")" PV=28209 -LIB_VERSION=${PV} +LIB_VERSION=${PV}+wfg1 fetch() { + tar_version=$(tar --version | head --lines 1) + case "${tar_version}" in + *"GNU tar"*) + tar_extra_opts="--owner root --group root" + ;; + *"libarchive"*) + tar_extra_opts="--uname root --gname root" + ;; + *) + echo "unknown tar implementation ${tar_version}" + ;; + esac + rm -Rf fcollada-${PV} svn export https://svn.wildfiregames.com/public/source-libs/trunk/fcollada@${PV} fcollada-${PV} - "${TAR}" cJf fcollada-${PV}.tar.xz fcollada-${PV} + # shellcheck disable=SC2086 + "${TAR}" -c ${tar_extra_opts} -Jf fcollada-${PV}.tar.xz fcollada-${PV} rm -R fcollada-${PV} } diff --git a/libraries/source/nvtt/build.sh b/libraries/source/nvtt/build.sh index 81d1b12af7..73aa186f7a 100755 --- a/libraries/source/nvtt/build.sh +++ b/libraries/source/nvtt/build.sh @@ -6,13 +6,27 @@ set -e cd "$(dirname "$0")" PV=28209 -LIB_VERSION=${PV}+wfg2 +LIB_VERSION=${PV}+wfg3 fetch() { + tar_version=$(tar --version | head --lines 1) + case "${tar_version}" in + *"GNU tar"*) + tar_extra_opts="--owner root --group root" + ;; + *"libarchive"*) + tar_extra_opts="--uname root --gname root" + ;; + *) + echo "unknown tar implementation ${tar_version}" + ;; + esac + rm -Rf nvtt-${PV} svn export https://svn.wildfiregames.com/public/source-libs/trunk/nvtt@${PV} nvtt-${PV} - "${TAR}" cJf nvtt-${PV}.tar.xz nvtt-${PV} + # shellcheck disable=SC2086 + "${TAR}" -c ${tar_extra_opts} -Jf nvtt-${PV}.tar.xz nvtt-${PV} rm -R nvtt-${PV} }