summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEthan Sommer <e5ten.arch@gmail.com>2019-11-07 02:23:08 +0100
committerAllan McRae <allan@archlinux.org>2019-11-07 12:40:44 +0100
commit1df22d3242a5db640a83124402249d34ac2e61e9 (patch)
tree6699f53e37ce4d54ed587559b03791f6c3289f68
parent7b73c4a75fbddcfa1bc552fed49c228b9cdaf7b0 (diff)
downloadpacman-1df22d3242a5db640a83124402249d34ac2e61e9.tar.gz
pacman-1df22d3242a5db640a83124402249d34ac2e61e9.tar.xz
repo-add: use wc -c on stdin instead of file to avoid use of cut
Redirect file to stdin so wc -c doesn't print a file name that needs to be stripped. Signed-off-by: Ethan Sommer <e5ten.arch@gmail.com> Signed-off-by: Allan McRae <allan@archlinux.org>
-rw-r--r--scripts/repo-add.sh.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in
index f7dd8948..5807a996 100644
--- a/scripts/repo-add.sh.in
+++ b/scripts/repo-add.sh.in
@@ -272,7 +272,7 @@ db_write_entry() {
error "$(gettext "Cannot use armored signatures for packages: %s")" "$pkgfile.sig"
return 1
fi
- pgpsigsize=$(wc -c "$pkgfile.sig" | cut -d' ' -f1)
+ pgpsigsize=$(wc -c < "$pkgfile.sig")
if (( pgpsigsize > 16384 )); then
error "$(gettext "Invalid package signature file '%s'.")" "$pkgfile.sig"
return 1
@@ -281,7 +281,7 @@ db_write_entry() {
pgpsig=$(base64 "$pkgfile.sig" | tr -d '\n')
fi
- csize=$(wc -c "$pkgfile" | cut -d' ' -f1)
+ csize=$(wc -c < "$pkgfile")
# compute checksums
msg2 "$(gettext "Computing checksums...")"