summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorajacoutot <ajacoutot@openbsd.org>2014-09-07 11:41:49 +0000
committerajacoutot <ajacoutot@openbsd.org>2014-09-07 11:41:49 +0000
commitc91b5231ca5e7a929ed99d8d8ec879ae1c5effec (patch)
tree44e81b9dc13d2c44fdecf1446c3665e46e9a92c4
parentUse SOCK_CLOEXEC (instead of later using fcntl(F_SETFD)) when creating sockets (diff)
downloadwireguard-openbsd-c91b5231ca5e7a929ed99d8d8ec879ae1c5effec.tar.xz
wireguard-openbsd-c91b5231ca5e7a929ed99d8d8ec879ae1c5effec.zip
Remove last use of xargs(1).
-rw-r--r--usr.sbin/sysmerge/sysmerge.sh7
1 files changed, 3 insertions, 4 deletions
diff --git a/usr.sbin/sysmerge/sysmerge.sh b/usr.sbin/sysmerge/sysmerge.sh
index ef7fc4c18c0..df66ecfcea2 100644
--- a/usr.sbin/sysmerge/sysmerge.sh
+++ b/usr.sbin/sysmerge/sysmerge.sh
@@ -1,6 +1,6 @@
#!/bin/ksh -
#
-# $OpenBSD: sysmerge.sh,v 1.182 2014/09/07 09:46:32 ajacoutot Exp $
+# $OpenBSD: sysmerge.sh,v 1.183 2014/09/07 11:41:49 ajacoutot Exp $
#
# Copyright (c) 2008-2014 Antoine Jacoutot <ajacoutot@openbsd.org>
# Copyright (c) 1998-2003 Douglas Barton <DougB@FreeBSD.org>
@@ -167,9 +167,8 @@ sm_cp_pkg_samples() {
done
if [[ ${_ret} -eq 0 ]]; then
- find . -type f | sort | \
- xargs sha256 -h ./usr/share/sysmerge/pkgsum || \
- _ret=1
+ find . -type f -exec sha256 '{}' + | sort \
+ >./usr/share/sysmerge/pkgsum || _ret=1
fi
[[ ${_ret} -ne 0 ]] && \
sm_error "failed to populate packages @samples and create sum file"