diff options
| author |   ajacoutot <ajacoutot@openbsd.org> | 2019-10-26 08:37:24 +0000 |
|---|---|---|
| committer | ajacoutot <ajacoutot@openbsd.org> | 2019-10-26 08:37:24 +0000 |
| commit | 59aecf2c0feb56382e2de9ef897907b44594887c (patch) | |
| tree | 68953c7f7b00e274fd32bc930314beb9e6c3b210 | |
| parent | Correct some ASM in a comment (diff) | |
| download | wireguard-openbsd-59aecf2c0feb56382e2de9ef897907b44594887c.tar.xz wireguard-openbsd-59aecf2c0feb56382e2de9ef897907b44594887c.zip | |
Wrap long lines.
| -rw-r--r-- | usr.sbin/syspatch/syspatch.sh | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/usr.sbin/syspatch/syspatch.sh b/usr.sbin/syspatch/syspatch.sh index fe82a0349ac..f97798e279c 100644 --- a/usr.sbin/syspatch/syspatch.sh +++ b/usr.sbin/syspatch/syspatch.sh @@ -1,6 +1,6 @@ #!/bin/ksh # -# $OpenBSD: syspatch.sh,v 1.156 2019/10/26 04:04:20 deraadt Exp $ +# $OpenBSD: syspatch.sh,v 1.157 2019/10/26 08:37:24 ajacoutot Exp $ # # Copyright (c) 2016, 2017 Antoine Jacoutot <ajacoutot@openbsd.org> # @@ -130,8 +130,8 @@ fetch_and_verify() [[ -n ${_tgz} ]] [[ -t 0 ]] || echo "${_title} ${_tgz}" - unpriv -f "${_TMP}/${_tgz}" ftp -N syspatch -VD "${_title}" -o "${_TMP}/${_tgz}" \ - "${_MIRROR}/${_tgz}" + unpriv -f "${_TMP}/${_tgz}" ftp -N syspatch -VD "${_title}" -o \ + "${_TMP}/${_tgz}" "${_MIRROR}/${_tgz}" (cd ${_TMP} && sha256 -qC ${_TMP}/SHA256 ${_tgz}) } @@ -164,8 +164,8 @@ ls_missing() local _c _d _f _cmd _l="$(ls_installed)" _p _r _sha=${_TMP}/SHA256 # don't output anything on stdout to prevent corrupting the patch list - unpriv -f "${_sha}.sig" ftp -N syspatch -MVo "${_sha}.sig" "${_MIRROR}/SHA256.sig" \ - >/dev/null + unpriv -f "${_sha}.sig" ftp -N syspatch -MVo "${_sha}.sig" \ + "${_MIRROR}/SHA256.sig" >/dev/null unpriv -f "${_sha}" signify -Veq -x ${_sha}.sig -m ${_sha} -p \ /etc/signify/openbsd-${_OSrev}-syspatch.pub >/dev/null @@ -175,7 +175,8 @@ ls_missing() while read _c; do _c=${_c##syspatch${_OSrev}-} && [[ -n ${_l} ]] && echo ${_c} | grep -qw -- "${_l}" || echo ${_c} done | while read _p; do - _cmd="ftp -N syspatch -MVo - ${_MIRROR}/syspatch${_OSrev}-${_p}.tgz" + _cmd="ftp -N syspatch -MVo - \ + ${_MIRROR}/syspatch${_OSrev}-${_p}.tgz" { unpriv ${_cmd} | tar tzf -; } 2>/dev/null | while read _f; do [[ -f /${_f} ]] || continue && echo ${_p} && pkill -u \ _syspatch -xf "${_cmd}" || true && break |