diff options
| author | Drew DeVault <sir@cmpwn.com> | 2017-03-20 03:55:00 +0100 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2017-04-04 04:21:20 +0200 |
| commit | 1af766987f66c63b029578374d679a353960d46d (patch) | |
| tree | 334415a0d5609afea5ca3fe191464bd85e841560 | |
| parent | d9908fc1f272a2859b525c3bd92d9f3e8a2a6293 (diff) | |
| download | pacman-1af766987f66c63b029578374d679a353960d46d.tar.gz pacman-1af766987f66c63b029578374d679a353960d46d.tar.xz | |
Replace @SIZECMD@ with POSIX-compatible command
Now uses wc -c $file | cut -d' ' -f1, which works using only POSIX
commands and removes the need for any platform-specific usages.
Signed-off-by: Drew DeVault <sir@cmpwn.com>
Signed-off-by: Allan McRae <allan@archlinux.org>
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | scripts/pkgdelta.sh.in | 4 | ||||
| -rw-r--r-- | scripts/repo-add.sh.in | 6 |
3 files changed, 5 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index 10e4415c..57f068d3 100644 --- a/configure.ac +++ b/configure.ac @@ -342,7 +342,6 @@ DEFAULT_DUFLAGS=" -sk --apparent-size" INODECMD="stat -c '%i %n'" OWNERCMD="stat -c '%u:%g'" MODECMD="stat -c '%a'" -SIZECMD="stat -c %s" SEDINPLACE="sed --follow-symlinks -i" STRIP_BINARIES="--strip-all" STRIP_SHARED="--strip-unneeded" @@ -352,7 +351,6 @@ case "${host_os}" in INODECMD="stat -f '%i %N'" OWNERCMD="stat -f '%u:%g'" MODECMD="stat -f '%Lp'" - SIZECMD="stat -f %z" SEDINPLACE="sed -i \"\"" DEFAULT_DUFLAGS=" -sk" ;; @@ -361,7 +359,6 @@ case "${host_os}" in INODECMD="/usr/bin/stat -f '%i %N'" OWNERCMD="/usr/bin/stat -f '%u:%g'" MODECMD="/usr/bin/stat -f '%Lp'" - SIZECMD="/usr/bin/stat -f %z" SEDINPLACE="/usr/bin/sed -i ''" DEFAULT_DUFLAGS=" -sk" STRIP_BINARIES="" @@ -374,7 +371,6 @@ AC_PATH_PROGS([DUPATH], [du], [du], [/usr/bin$PATH_SEPARATOR/bin] ) AC_SUBST(INODECMD) AC_SUBST(OWNERCMD) AC_SUBST(MODECMD) -AC_SUBST(SIZECMD) AC_SUBST(SEDINPLACE) AC_SUBST(STRIP_BINARIES) AC_SUBST(STRIP_SHARED) @@ -561,7 +557,6 @@ ${PACKAGE_NAME}: File inode command : ${INODECMD} File owner command : ${OWNERCMD} File mode command : ${MODECMD} - Filesize command : ${SIZECMD} In-place sed command : ${SEDINPLACE} libalpm version : ${LIB_VERSION} diff --git a/scripts/pkgdelta.sh.in b/scripts/pkgdelta.sh.in index 9f87185b..4500dd75 100644 --- a/scripts/pkgdelta.sh.in +++ b/scripts/pkgdelta.sh.in @@ -119,7 +119,7 @@ create_xdelta() newver="$pkgver" newarch="$arch" - pkgsize="$(@SIZECMD@ -L "$newfile")" + pkgsize="$(wc -c "$newfile" | cut -d' ' -f1)" if ((pkgsize < min_pkg_size)); then msg "$(gettext "Skipping delta creation for small package: %s - size %s")" "$newname" "$pkgsize" @@ -151,7 +151,7 @@ create_xdelta() return 1 fi - deltasize="$(@SIZECMD@ -L "$deltafile")" + deltasize="$(wc -c "$deltafile" | cut -d' ' -f1)" if ((max_delta_size * pkgsize / 100 < deltasize)); then msg "$(gettext "Delta package larger than maximum size. Removing.")" diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 6333f6a2..68edbf4b 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -153,7 +153,7 @@ db_write_delta() { # get md5sum and compressed size of package md5sum=$(md5sum "$deltafile") md5sum=${md5sum%% *} - csize=$(@SIZECMD@ -L "$deltafile") + csize=$(wc -c "$deltafile" | cut -d' ' -f1) oldfile=$(xdelta3 printhdr "$deltafile" | grep "XDELTA filename (source)" | sed 's/.*: *//') newfile=$(xdelta3 printhdr "$deltafile" | grep "XDELTA filename (output)" | sed 's/.*: *//') @@ -368,7 +368,7 @@ db_write_entry() { error "$(gettext "Cannot use armored signatures for packages: %s")" "$pkgfile.sig" return 1 fi - pgpsigsize=$(@SIZECMD@ -L "$pkgfile.sig") + pgpsigsize=$(wc -c "$pkgfile.sig" | cut -d' ' -f1) if (( pgpsigsize > 16384 )); then error "$(gettext "Invalid package signature file '%s'.")" "$pkgfile.sig" return 1 @@ -377,7 +377,7 @@ db_write_entry() { pgpsig=$(base64 "$pkgfile.sig" | tr -d '\n') fi - csize=$(@SIZECMD@ -L "$pkgfile") + csize=$(wc -c "$pkgfile" | cut -d' ' -f1) # compute checksums msg2 "$(gettext "Computing checksums...")" |