Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Straube <michael.straubej@gmail.com>2020-10-21 10:05:43 +0200
committerAllan McRae <allan@archlinux.org>2020-11-26 15:45:29 +1000
commit94ac3330dd3a42958ad5d9606ec254bc112936bf (patch)
tree537f262b77e73262466204dac0910a967e9eac99
parent4d8f58d3b940f778b27c59e53ea9f3fab20a07ba (diff)
libmakepkg: compress: fix tar extension
With commit 74aacf44958e1343b910b3fbdcf753393857f070 creating uncompressed .tar packages fails. -> Compressing package... /usr/share/makepkg/util/compress.sh: line 70: COMPRESS.TAR[@]: invalid variable name bsdtar: Write error Empty the '$ext' variable for the '.tar' extension in get_compress_command() to fix this. We would fallback to cat for 'tar' anyways. Signed-off-by: Michael Straube <michael.straubej@gmail.com> Signed-off-by: Allan McRae <allan@archlinux.org>
-rw-r--r--scripts/libmakepkg/util/compress.sh.in3
1 files changed, 3 insertions, 0 deletions
diff --git a/scripts/libmakepkg/util/compress.sh.in b/scripts/libmakepkg/util/compress.sh.in
index d35a01fa..ab3b1e6e 100644
--- a/scripts/libmakepkg/util/compress.sh.in
+++ b/scripts/libmakepkg/util/compress.sh.in
@@ -65,6 +65,9 @@ get_compression_command() {
esac
ext=${ext#*.tar.}
+ # empty the variable for plain tar archives so we fallback to cat
+ ext=${ext#*.tar}
+
if [[ -n $ext ]]; then
extarray="COMPRESS${ext^^}[@]"
resolvecmd=("${!extarray}")