svn commit: r277518 - head/tools/tools/nanobsd

[Will Andrews]

Author: will
Date: Thu Jan 22 00:52:34 2015
New Revision: 277518
URL: https://svnweb.freebsd.org/changeset/base/277518

Log:
  Enable nanobsd.sh to be executed when pwd != NANO_SRC.
  
  While here, fix a bug in which NANO_PMAKE would not be appended at the
  appropriate time.
  
  Simply move both checks to after the call to set_defaults_and_export().
  
  Tested by:	lstewart
  Sponsored by:	Spectra Logic

Modified:
  head/tools/tools/nanobsd/nanobsd.sh   (contents, props changed)

Modified: head/tools/tools/nanobsd/nanobsd.sh
==============================================================================
--- head/tools/tools/nanobsd/nanobsd.sh	Wed Jan 21 21:49:03 2015	(r277517)
+++ head/tools/tools/nanobsd/nanobsd.sh	Thu Jan 22 00:52:34 2015	(r277518)
@@ -121,6 +121,13 @@ if [ $# -gt 0 ] ; then
 	usage
 fi
 
+#######################################################################
+# And then it is as simple as that...
+
+# File descriptor 3 is used for logging output, see pprint
+exec 3>&1
+set_defaults_and_export
+
 if [ ! -d "${NANO_TOOLS}" ]; then
 	echo "NANO_TOOLS directory does not exist" 1>&2
 	exit 1
@@ -130,13 +137,6 @@ if ! $do_clean; then
 	NANO_PMAKE="${NANO_PMAKE} -DNO_CLEAN"
 fi
 
-#######################################################################
-# And then it is as simple as that...
-
-# File descriptor 3 is used for logging output, see pprint
-exec 3>&1
-set_defaults_and_export
-
 pprint 1 "NanoBSD image ${NANO_NAME} build starting"
 
 if $do_world ; then