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
)
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
