From owner-svn-src-all@freebsd.org Tue Sep 1 21:18:34 2015 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 400EA9C7DDC; Tue, 1 Sep 2015 21:18:34 +0000 (UTC) (envelope-from dteske@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 30F311F68; Tue, 1 Sep 2015 21:18:34 +0000 (UTC) (envelope-from dteske@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t81LIYNJ007909; Tue, 1 Sep 2015 21:18:34 GMT (envelope-from dteske@FreeBSD.org) Received: (from dteske@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t81LIYAM007908; Tue, 1 Sep 2015 21:18:34 GMT (envelope-from dteske@FreeBSD.org) Message-Id: <201509012118.t81LIYAM007908@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dteske set sender to dteske@FreeBSD.org using -f From: Devin Teske Date: Tue, 1 Sep 2015 21:18:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r287378 - head/usr.sbin/sysrc X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2015 21:18:34 -0000 Author: dteske Date: Tue Sep 1 21:18:33 2015 New Revision: 287378 URL: https://svnweb.freebsd.org/changeset/base/287378 Log: Remove `SYSRC_' prefix from $SYSRC_VERBOSE (prefix unnecessary since this is a non-inheritable attribute; was previously). MFC after: 3 days X-MFC-to: stable/10 Modified: head/usr.sbin/sysrc/sysrc Modified: head/usr.sbin/sysrc/sysrc ============================================================================== --- head/usr.sbin/sysrc/sysrc Tue Sep 1 20:49:38 2015 (r287377) +++ head/usr.sbin/sysrc/sysrc Tue Sep 1 21:18:33 2015 (r287378) @@ -57,7 +57,7 @@ SHOW_EQUALS= SHOW_FILE= SHOW_NAME=1 SHOW_VALUE=1 -SYSRC_VERBOSE= +VERBOSE= ############################################################ FUNCTIONS @@ -240,11 +240,11 @@ while getopts aAcdDef:Fhij:nNqR:vxX flag JAIL="$OPTARG";; n) SHOW_NAME=;; N) SHOW_VALUE=;; - q) QUIET=1 SYSRC_VERBOSE=;; + q) QUIET=1 VERBOSE=;; R) [ "$OPTARG" ] || die \ "%s: Missing or null argument to \`-R' flag" "$pgm" ROOTDIR="$OPTARG";; - v) SYSRC_VERBOSE=1 QUIET=;; + v) VERBOSE=1 QUIET=;; x) DELETE=${DELETE:-1};; X) DELETE=2;; \?) usage;; @@ -300,7 +300,7 @@ fi SEP=': ' [ "$SHOW_FILE" ] && SHOW_EQUALS= [ "$SHOW_NAME" ] || SHOW_EQUALS= -[ "$SYSRC_VERBOSE" = "0" ] && SYSRC_VERBOSE= +[ "$VERBOSE" = "0" ] && VERBOSE= if [ ! "$SHOW_VALUE" ]; then SHOW_NAME=1 SHOW_EQUALS= @@ -315,7 +315,7 @@ if [ "$JAIL" -o "$ROOTDIR" ]; then # Reconstruct the arguments that we want to carry-over # args=" - ${SYSRC_VERBOSE:+-v} + ${VERBOSE:+-v} ${QUIET:+-q} $( [ "$DELETE" = "1" ] && echo \ -x ) $( [ "$DELETE" = "2" ] && echo \ -X ) @@ -431,7 +431,7 @@ if [ "$SHOW_ALL" ]; then IFS="$IFS|" EXCEPT="IFS|EXCEPT|PATH|RC_DEFAULTS|OPTIND|DESCRIBE|SEP" EXCEPT="$EXCEPT|DELETE|SHOW_ALL|SHOW_EQUALS|SHOW_NAME" - EXCEPT="$EXCEPT|SHOW_VALUE|SHOW_FILE|SYSRC_VERBOSE|RC_CONFS" + EXCEPT="$EXCEPT|SHOW_VALUE|SHOW_FILE|VERBOSE|RC_CONFS" EXCEPT="$EXCEPT|pgm|SUCCESS|FAILURE|CHECK_ONLY" EXCEPT="$EXCEPT|f_sysrc_desc_awk|f_sysrc_delete_awk" @@ -499,7 +499,7 @@ if [ "$SHOW_ALL" ]; then continue fi - [ "$SYSRC_VERBOSE" ] && \ + [ "$VERBOSE" ] && \ echo -n "$( f_sysrc_find "$NAME" ): " # @@ -546,7 +546,7 @@ while [ $# -gt 0 ]; do # # If verbose, prefix line with where the directive lives - if [ "$SYSRC_VERBOSE" -a ! "$CHECK_ONLY" ]; then + if [ "$VERBOSE" -a ! "$CHECK_ONLY" ]; then file=$( f_sysrc_find "$NAME" ) [ "$file" = "$RC_DEFAULTS" -o ! "$file" ] && \ file=$( f_sysrc_get 'rc_conf_files%%[$IFS]*' ) @@ -573,7 +573,7 @@ while [ $# -gt 0 ]; do if [ "$CHECK_ONLY" ]; then if ! IGNORED=$( f_sysrc_get "$NAME?" ); then status=$FAILURE - [ "$SYSRC_VERBOSE" ] && + [ "$VERBOSE" ] && echo "$NAME: not currently set" shift 1 continue @@ -581,12 +581,12 @@ while [ $# -gt 0 ]; do value=$( f_sysrc_get "$NAME" ) if [ "$value" != "${1#*=}" ]; then status=$FAILURE - if [ "$SYSRC_VERBOSE" ]; then + if [ "$VERBOSE" ]; then echo -n "$( f_sysrc_find "$NAME" ): " echo -n "$NAME: would change from " echo "\`$value' to \`${1#*=}'" fi - elif [ "$SYSRC_VERBOSE" ]; then + elif [ "$VERBOSE" ]; then echo -n "$( f_sysrc_find "$NAME" ): " echo "$NAME: already set to \`$value'" fi @@ -715,7 +715,7 @@ while [ $# -gt 0 ]; do continue fi - if [ "$SYSRC_VERBOSE" ]; then + if [ "$VERBOSE" ]; then if [ "$SHOW_EQUALS" ]; then echo -n ": $( f_sysrc_find "$NAME" ); " else