From nobody Sat Nov 18 11:01:54 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SXW7744NMz50wv1; Sat, 18 Nov 2023 11:01:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SXW76733cz4MYC; Sat, 18 Nov 2023 11:01:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700305315; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=y5pMw/lM22NKiLzNbs52wd9Y1331Zrsxjpxq08s6itc=; b=gGXS7MmqLIOqIeNmAmo3GIumWGvzBEoxockeyOWJelCrwDpcGn3imSiiedzbGNbJEzOxyl 81GTCXoOzSLvKS9620Vhisn+z88yl2LxvjMlfXi7yaJDiahQygRU84nSvjg/KxTH7b0gZz fRyNuOhihvzGcgZyoPB1eOJ9zPYF9SzJfeLHcYnma/yIZ42KmTzeLIUmNHyqzdiPojPAXB rHYf5QEeZ6gEvlzkpf4rgkduH9eFG3gwZzXQUNDMRj+3tI7sDywH+4A5gAlDqI6rooMKjW 3nl8EF7HJqeguAMFEI1CN4k+rfcpz0m1+N3a9R+RsXhjKJtv7haZih5oxIphxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700305315; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=y5pMw/lM22NKiLzNbs52wd9Y1331Zrsxjpxq08s6itc=; b=SEqM698H4YsDvUPpjGaqL6DepIEwTH6uE/YKdvYb3+Z7ALlpEZm5JB6V0AOyLJ7Xk9MmpS hzdbf7KRRG6hew92u8cWZdqbYoUsqtYw/8jZ8Bu+KjEvVHYPQlm35EWvWnj3cnCu7pbNlH clVkkprtlc2pmkza4LF164fWeGqseNDUdLsveBnRtAOmilfGsD2VgvsN82y781EDWL66Va 75mi7fUnedbza9CrLr1DSh7b4pZjHftqW4na3V7+BN0CnGliGgSdvzRu5/pqtfMrhHwOvX 66cT8a8I+38uo+XcVod5Xjt+V3CVk2EPJcGqu4st9WFBL0wDSH7RrcOFvUZFyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700305315; a=rsa-sha256; cv=none; b=J9eyJPnuTydG16RUMCoN23SpZzeyonjOCXyu0H6wj+tdMPA8LgMo55Tvw3ge1EID0qb7HV THSzDOLJ9JsE2J1Rhx6BuexEkhShrvqCYNFOvrGeM37VQLkxWd4DCdoiTG0WLUqB53UKv8 /qeLNNFgtWxsaqYT4SziIQi0rD8BvffoQ2h1gB8QwFKZ8R3u0YpFxLRj4sDV2+05QJl6DC 7ApmARIQjXL/rZ9T5PJFAj4UhdVJ9VYt2EZfBFpM8v0qZ8kAmyvrMtQWTaAwX5zYljIphz 4imA3yDXpmSrulGgSWeGDptnfro1x4JldgJL/9PyXfgXtqFsTcK5wI/JzMA5qQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SXW7665p2z92P; Sat, 18 Nov 2023 11:01:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AIB1s5Z080587; Sat, 18 Nov 2023 11:01:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AIB1spv080584; Sat, 18 Nov 2023 11:01:54 GMT (envelope-from git) Date: Sat, 18 Nov 2023 11:01:54 GMT Message-Id: <202311181101.3AIB1spv080584@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jens Schweikhardt Subject: git: 8703e04009f0 - main - Apply non-abrasive script-cleaning fluid. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: schweikh X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8703e04009f0a0c229058c9f7c872878b6675fb2 Auto-Submitted: auto-generated The branch main has been updated by schweikh: URL: https://cgit.FreeBSD.org/src/commit/?id=8703e04009f0a0c229058c9f7c872878b6675fb2 commit 8703e04009f0a0c229058c9f7c872878b6675fb2 Author: Jens Schweikhardt AuthorDate: 2023-11-18 10:58:26 +0000 Commit: Jens Schweikhardt CommitDate: 2023-11-18 10:58:26 +0000 Apply non-abrasive script-cleaning fluid. * consistent use of tabs * consistent quoting of parameters * if/then cosmetics to match rc.subr style --- usr.sbin/periodic/etc/weekly/310.locate | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/usr.sbin/periodic/etc/weekly/310.locate b/usr.sbin/periodic/etc/weekly/310.locate index 9ccd376074c9..84c0d69610e1 100755 --- a/usr.sbin/periodic/etc/weekly/310.locate +++ b/usr.sbin/periodic/etc/weekly/310.locate @@ -2,32 +2,31 @@ # # -# If there is a global system configuration file, suck it in. +# If there is a global system configuration file, read it. # -if [ -r /etc/defaults/periodic.conf ] -then - . /etc/defaults/periodic.conf - source_periodic_confs +if [ -r /etc/defaults/periodic.conf ]; then + . /etc/defaults/periodic.conf + source_periodic_confs fi case "$weekly_locate_enable" in - [Yy][Ee][Ss]) + [Yy][Ee][Ss]) echo "" echo "Rebuilding locate database:" - . /etc/locate.rc - : ${FCODES:="/var/db/locate.database"} - locdb="$FCODES" + . /etc/locate.rc + : "${FCODES:=/var/db/locate.database}" + locdb="$FCODES" - touch $locdb && rc=0 || rc=3 - chown nobody $locdb || rc=3 - chmod 644 $locdb || rc=3 + touch "$locdb" && rc=0 || rc=3 + chown nobody "$locdb" || rc=3 + chmod 644 "$locdb" || rc=3 cd / echo /usr/libexec/locate.updatedb | nice -n 5 su -fm nobody || rc=3 - chmod 444 $locdb || rc=3;; + chmod 444 "$locdb" || rc=3;; - *) rc=0;; + *) rc=0;; esac -exit $rc +exit "$rc"