[66734] trunk/base/src/port1.0/portmain.tcl

[jmr at macports.org]

Revision: 66734
          http://trac.macports.org/changeset/66734
Author:   jmr at macports.org
Date:     2010-04-21 09:43:54 -0700 (Wed, 21 Apr 2010)
Log Message:
-----------
revert r66732, but make sure we're really expanding ~user and not just ~

Revision Links:
--------------
    http://trac.macports.org/changeset/66732

Modified Paths:
--------------
    trunk/base/src/port1.0/portmain.tcl

Modified: trunk/base/src/port1.0/portmain.tcl
===================================================================
--- trunk/base/src/port1.0/portmain.tcl	2010-04-21 16:37:17 UTC (rev 66733)
+++ trunk/base/src/port1.0/portmain.tcl	2010-04-21 16:43:54 UTC (rev 66734)
@@ -146,9 +146,14 @@
     if {[info exists env(HOME)]} {
         # HOME environment var is set, use it.
         set userhome "$env(HOME)"
+    } elseif {$euid == 0 && [info exists env(SUDO_USER)] && $env(SUDO_USER) != ""} {
+        set userhome [file normalize "~$env(SUDO_USER)"]
     } else {
-        # apparently there's no way to expand ~user without HOME
-        set userhome ""
+        # the environment var isn't set, expand ~user instead
+        set username [uid_to_name [getuid]]
+        if {[catch {set userhome [file normalize "~$username"]}]} {
+            set userhome ""
+        }
     }
 
     set altprefix [file join $userhome .macports]
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100421/69248375/attachment.html>