svn commit: r361683 - head/usr.sbin/certctl

[Kyle Evans]

n Sun, May 31, 2020 at 8:25 PM Kyle Evans <kevans at freebsd.org> wrote:
>
> Author: kevans
> Date: Mon Jun  1 01:25:19 2020
> New Revision: 361683
> URL: https://svnweb.freebsd.org/changeset/base/361683
>
> Log:
>   certctl: fix test syntax
>
>   test doesn't understand &&, but it does understand -a.
>
>   MFC after:    1 week
>

Sorry, this was a pretty low-quality commit message; && is a shell
construct, so the previous version lead to a lot of spam as the [
invocation was split and the ] terminator lost.

> Modified:
>   head/usr.sbin/certctl/certctl.sh
>
> Modified: head/usr.sbin/certctl/certctl.sh
> ==============================================================================
> --- head/usr.sbin/certctl/certctl.sh    Sun May 31 22:46:32 2020        (r361682)
> +++ head/usr.sbin/certctl/certctl.sh    Mon Jun  1 01:25:19 2020        (r361683)
> @@ -102,7 +102,7 @@ do_scan()
>                 [ -d "$CPATH" ] || continue
>                 echo "Scanning $CPATH for certificates..."
>                 for CFILE in $(ls -1 "${CPATH}" | grep -Ee "${FILEPAT}"); do
> -                       [ -e "$CPATH/$CFILE" && $UNPRIV -eq 0 ] || continue
> +                       [ -e "$CPATH/$CFILE" -a $UNPRIV -eq 0 ] || continue
>                         [ $VERBOSE -gt 0 ] && echo "Reading $CFILE"
>                         "$CFUNC" "$CPATH/$CFILE"
>                 done