abuild: call tar portably

This commit is contained in:
A. Wilcox 2017-06-23 07:45:41 +00:00 committed by Timo Teräs
parent 9dd4a70eb3
commit 597a7f167b
2 changed files with 3 additions and 3 deletions

View File

@ -31,7 +31,7 @@ do_sign() {
sig=".SIGN.RSA.$keyname" sig=".SIGN.RSA.$keyname"
openssl dgst -sha1 -sign "$privkey" -out "$sig" "$i" openssl dgst -sha1 -sign "$privkey" -out "$sig" "$i"
tmptargz=$(mktemp) tmptargz=$(mktemp)
tar -c "$sig" | abuild-tar --cut | gzip -9 > "$tmptargz" tar -f - -c "$sig" | abuild-tar --cut | gzip -9 > "$tmptargz"
tmpsigned=$(mktemp) tmpsigned=$(mktemp)
cat "$tmptargz" "$i" > "$tmpsigned" cat "$tmptargz" "$i" > "$tmpsigned"
rm -f "$tmptargz" "$sig" rm -f "$tmptargz" "$sig"

View File

@ -1375,7 +1375,7 @@ create_apks() {
touch .dummy touch .dummy
set -- .dummy set -- .dummy
fi fi
tar --xattrs -c "$@" | abuild-tar --hash | gzip -9 >"$dir"/data.tar.gz tar --xattrs -f - -c "$@" | abuild-tar --hash | gzip -9 >"$dir"/data.tar.gz
msg "Create checksum..." msg "Create checksum..."
# append the hash for data.tar.gz # append the hash for data.tar.gz
@ -1384,7 +1384,7 @@ create_apks() {
# control.tar.gz # control.tar.gz
cd "$dir" cd "$dir"
tar -c $(cat "$dir"/.metafiles) | abuild-tar --cut \ tar -f - -c $(cat "$dir"/.metafiles) | abuild-tar --cut \
| gzip -9 > control.tar.gz | gzip -9 > control.tar.gz
abuild-sign -q control.tar.gz || exit 1 abuild-sign -q control.tar.gz || exit 1