Port diagnose PATH check improvements

Get shell from dscl instead of assuming bash. Don't try to check the value of PATH with shells we don't know about. The code to add our dirs to PATH only works with bash, so don't offer to do it with other shells. Use the interactive questions API instead of reimplementing it. Fixes: https://trac.macports.org/ticket/53473 (cherry picked from commit 17c70c9)
macports · Feb 17, 2017 · a5c8a42 · a5c8a42
1 parent 4c29521
commit a5c8a42
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 25 deletions.
diff --git a/src/macports1.0/diagnose.tcl b/src/macports1.0/diagnose.tcl
@@ -109,7 +109,12 @@ namespace eval diagnose {
             set config_options(profile_path) "${macports::user_home}/.bash_profile"
         }
         if {![info exists config_options(shell_location)]} {
-            set config_options(shell_location) /bin/bash
+            if {[info exists macports::sudo_user]} {
+                set username ${macports::sudo_user}
+            } else {
+                set username [exec id -un]
+            }
+            set config_options(shell_location) [lindex [exec /usr/bin/dscl . -read "/Users/${username}" shell] end]
         }
 
         # Start the checks
@@ -696,6 +701,12 @@ namespace eval diagnose {
         # Returns:
         #           None.
 
+        set known_shells [list bash csh ksh sh tcsh zsh]
+        set shell_name [file tail $shell_loc]
+        if {$shell_name ni $known_shells} {
+            return
+        }
+
         set path ${macports::user_path}
         set split [split $path :]
 
@@ -708,34 +719,33 @@ namespace eval diagnose {
             return
 
         } else {
-            ui_warn "your \$PATH environment variable does not currently include, $port_loc/bin, which is where port is located. \
-                     Would you like to add $port_loc/bin to your \$PATH variable now? \[Y/N\]"
-            set input [gets stdin]
-
-            if {$input eq "y" || $input eq "Y"} {
-                # XXX: this should use the same paths and comments as the
-                # postflight script of the pkg installer. Maybe they could even
-                # share code?
-                ui_msg "Attempting to add $port_loc/bin to $profile_path"
-
-                if {[file exists $profile_path]} {
-                    if {[file writable $profile_path]} {
-                        set fd [open $profile_path a]
-                        puts $fd "export PATH=$port_loc/bin:$port_loc/sbin:\$PATH"
-                        close $fd
-
-                        ui_msg "Added PATH properly. Please open a new terminal window to load the modified ${profile_path}."
+            ui_warn "your \$PATH environment variable does not currently include $port_loc/bin, which is where port is located."
+
+            # XXX Only works for bash. Should set default profile_path based on the shell.
+            if {[info exists macports::ui_options(questions_yesno)] && $shell_name eq "bash"} {
+                set retval [$macports::ui_options(questions_yesno) "" "DiagnoseFixPATH" "" n 0 "Would you like to add $port_loc/bin to your \$PATH variable now?"]
+                if {$retval} {
+                    # XXX: this should use the same paths and comments as the
+                    # postflight script of the pkg installer. Maybe they could even
+                    # share code?
+                    ui_msg "Attempting to add $port_loc/bin to $profile_path"
+
+                    if {[file exists $profile_path]} {
+                        if {[file writable $profile_path]} {
+                            set fd [open $profile_path a]
+                            puts $fd "export PATH=$port_loc/bin:$port_loc/sbin:\$PATH"
+                            close $fd
+
+                            ui_msg "Added PATH properly. Please open a new terminal window to load the modified ${profile_path}."
+                        } else {
+                            ui_error "Can't write to ${profile_path}."
+                        }
                     } else {
-                        ui_error "Can't write to ${profile_path}."
+                        ui_error "$profile_path does not exist."
                     }
                 } else {
-                    ui_error "$profile_path does not exist."
+                    ui_msg "Not fixing your \$PATH variable."
                 }
-            } elseif {$input eq "n" || $input eq "N"} {
-                ui_msg "Not fixing your \$PATH variable."
-
-            } else {
-                ui_msg "Not a valid choice: $input"
             }
        }
    }

diff --git a/src/macports1.0/macports.tcl b/src/macports1.0/macports.tcl
@@ -675,6 +675,10 @@ proc mportinit {{up_ui_options {}} {up_options {}} {up_variations {}}} {
 
     # Save the path for future processing
     set macports::user_path $env(PATH)
+    # Likewise any SUDO_USER
+    if {[info exists env(SUDO_USER)]} {
+        set macports::sudo_user $env(SUDO_USER)
+    }
 
     # Save SSH_AUTH_SOCK for ports tree sync
     if {[info exists env(SSH_AUTH_SOCK)]} {