svn commit: r222590 - user/dougb/portmaster

[Doug Barton]

Author: dougb
Date: Thu Jun  2 00:58:20 2011
New Revision: 222590
URL: http://svn.freebsd.org/changeset/base/222590

Log:
  We want to make sure that $TMPDIR exists before trying to use it. The
  cheapest way to do this is to just call mkdir -p. Move the umask call
  before this to be safe.
  
  Split the test for the existence of /usr/X11R6 and whether or not it's
  a link for one more micro-optimization.

Modified:
  user/dougb/portmaster/portmaster

Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster	Thu Jun  2 00:43:16 2011	(r222589)
+++ user/dougb/portmaster/portmaster	Thu Jun  2 00:58:20 2011	(r222590)
@@ -5,15 +5,17 @@
 
 trap trap_exit INT
 
+umask 022
+
 # Initialize crucial values for the parent, and export them for the children
 if [ -z "$PM_PARENT_PID" ]; then
 	PM_PARENT_PID=$$
-	: ${TMPDIR:=/tmp}
+	: ${TMPDIR:=/tmp} ; /bin/mkdir -p $TMPDIR
 	UPGRADE_TOOL=portmaster
 
 	# /usr/local is needed in the path for make
 	PATH=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin
-	[ -e /usr/X11R6 -a ! -L /usr/X11R6 ] && PATH=$PATH:/usr/X11R6/bin
+	[ -e /usr/X11R6 ] && [ ! -L /usr/X11R6 ] && PATH=$PATH:/usr/X11R6/bin
 	[ -n "$CCACHE_PATH" -a -z "$NOCCACHE" ] && PATH="/usr/local/libexec/ccache:$PATH"
 	export PM_PARENT_PID TMPDIR UPGRADE_TOOL PATH
 
@@ -44,8 +46,6 @@ if [ -z "$PM_PARENT_PID" ]; then
 	unset euid
 fi
 
-umask 022
-
 #=============== Begin functions we always want to have ===============
 
 version () {