yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: use /usr/bin/tar in windows build

This commit is contained in:
Zaiming (Stone) Shi 2022-05-28 11:51:04 +02:00
parent d249c2c22e
commit 1492fa72ec
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build
View File

@ -56,8 +56,10 @@ fi
if [ "${SYSTEM}" = 'windows' ]; then if [ "${SYSTEM}" = 'windows' ]; then
# windows does not like the find # windows does not like the find
FIND="/usr/bin/find" FIND="/usr/bin/find"
TAR="/usr/bin/tar"
else else
FIND='find' FIND='find'
TAR='tar'
fi fi
log() { log() {
@ -117,7 +119,7 @@ make_relup() {
## we have to create tmp dir to untar old tgz, as `tar --skip-old-files` is not supported on all plantforms ## we have to create tmp dir to untar old tgz, as `tar --skip-old-files` is not supported on all plantforms
local tmp_dir local tmp_dir
tmp_dir="$(mktemp -d -t emqx.XXXXXXX)" tmp_dir="$(mktemp -d -t emqx.XXXXXXX)"
tar -C "$tmp_dir" -zxf "$tgzfile" $TAR -C "$tmp_dir" -zxf "$tgzfile"
cp -npr "$tmp_dir/releases"/* "${rel_dir}/releases/" || true cp -npr "$tmp_dir/releases"/* "${rel_dir}/releases/" || true
cp -npr "$tmp_dir/lib"/* "${rel_dir}/lib/" || true cp -npr "$tmp_dir/lib"/* "${rel_dir}/lib/" || true
rm -rf "$tmp_dir" rm -rf "$tmp_dir"
@ -181,7 +183,7 @@ make_tgz() {
if [ ! -f "$src_tarball" ]; then if [ ! -f "$src_tarball" ]; then
log "ERROR: $src_tarball is not found" log "ERROR: $src_tarball is not found"
fi fi
tar zxf "${src_tarball}" -C "${tard}/emqx" $TAR zxf "${src_tarball}" -C "${tard}/emqx"
if [ -f "${tard}/emqx/releases/${PKG_VSN}/relup" ]; then if [ -f "${tard}/emqx/releases/${PKG_VSN}/relup" ]; then
./scripts/inject-relup.escript "${tard}/emqx/releases/${PKG_VSN}/relup" ./scripts/inject-relup.escript "${tard}/emqx/releases/${PKG_VSN}/relup"
fi fi
@ -191,7 +193,7 @@ make_tgz() {
## create tar after change dir ## create tar after change dir
## to avoid creating an extra level of 'emqx' dir in the .tar.gz file ## to avoid creating an extra level of 'emqx' dir in the .tar.gz file
pushd "${tard}/emqx" >/dev/null pushd "${tard}/emqx" >/dev/null
tar -zcf "../${target_name}" -- * $TAR -zcf "../${target_name}" -- *
popd >/dev/null popd >/dev/null
mv "${tard}/${target_name}" "${target}" mv "${tard}/${target_name}" "${target}"
case "$SYSTEM" in case "$SYSTEM" in