From owner-svn-src-all@freebsd.org Fri Sep 27 20:56:50 2019 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E4CCC12CCE2; Fri, 27 Sep 2019 20:56:50 +0000 (UTC) (envelope-from imp@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46g3xt185kz4KFS; Fri, 27 Sep 2019 20:56:50 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E1B5E1EAD5; Fri, 27 Sep 2019 20:56:49 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x8RKunrj006909; Fri, 27 Sep 2019 20:56:49 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x8RKunJP006908; Fri, 27 Sep 2019 20:56:49 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201909272056.x8RKunJP006908@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Fri, 27 Sep 2019 20:56:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r352822 - head/tools/tools/nanobsd X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: head/tools/tools/nanobsd X-SVN-Commit-Revision: 352822 X-SVN-Commit-Repository: base 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.29 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: Fri, 27 Sep 2019 20:56:51 -0000 Author: imp Date: Fri Sep 27 20:56:49 2019 New Revision: 352822 URL: https://svnweb.freebsd.org/changeset/base/352822 Log: Use set -o xtrace in preference to set -x for consistency with the rest of nanobsd.sh. Modified: head/tools/tools/nanobsd/defaults.sh Modified: head/tools/tools/nanobsd/defaults.sh ============================================================================== --- head/tools/tools/nanobsd/defaults.sh Fri Sep 27 20:56:44 2019 (r352821) +++ head/tools/tools/nanobsd/defaults.sh Fri Sep 27 20:56:49 2019 (r352822) @@ -445,8 +445,8 @@ run_early_customize ( ) { pprint 2 "early customize \"$c\"" pprint 3 "log: ${NANO_LOG}/_.early_cust.$c" pprint 4 "`type $c`" - { t=$(set -o | awk '$1 == "xtrace" && $2 == "off" { print "set +x"}'); - set -x ; + { t=$(set -o | awk '$1 == "xtrace" && $2 == "off" { print "set +o xtrace"}'); + set -o xtrace ; $c ; eval $t } >${NANO_LOG}/_.early_cust.$c 2>&1 @@ -466,7 +466,7 @@ run_customize ( ) ( pprint 2 "customize \"$c\"" pprint 3 "log: ${NANO_LOG}/_.cust.$c" pprint 4 "`type $c`" - ( set -x ; $c ) > ${NANO_LOG}/_.cust.$c 2>&1 + ( set -o xtrace ; $c ) > ${NANO_LOG}/_.cust.$c 2>&1 done ) @@ -481,7 +481,7 @@ run_late_customize ( ) ( pprint 2 "late customize \"$c\"" pprint 3 "log: ${NANO_LOG}/_.late_cust.$c" pprint 4 "`type $c`" - ( set -x ; $c ) > ${NANO_LOG}/_.late_cust.$c 2>&1 + ( set -o xtrace ; $c ) > ${NANO_LOG}/_.late_cust.$c 2>&1 done )