[36002] trunk/base/src/port/port.tcl

[jkh at apple.com]

Revision: 36002
          http://trac.macosforge.org/projects/macports/changeset/36002
Author:   jkh at apple.com
Date:     2008-04-13 21:07:30 -0700 (Sun, 13 Apr 2008)

Log Message:
-----------
Pick a reasonable default for people without EDITOR set, following existing
precedent for editor escapes.

Modified Paths:
--------------
    trunk/base/src/port/port.tcl

Modified: trunk/base/src/port/port.tcl
===================================================================
--- trunk/base/src/port/port.tcl	2008-04-14 02:56:23 UTC (rev 36001)
+++ trunk/base/src/port/port.tcl	2008-04-14 04:07:30 UTC (rev 36002)
@@ -2125,15 +2125,12 @@
                         }
                     }
                     
-                    # Invoke the editor
-                    if { $editor == "" } {
-                        break_softcontinue "No EDITOR is specified in your environment" 1 status
-                    } else {
-                        if {[catch {eval exec >/dev/stdout </dev/stdin $editor $portfile} result]} {
-                            global errorInfo
-                            ui_debug "$errorInfo"
-                            break_softcontinue "unable to invoke editor $editor: $result" 1 status
-                        }
+                    # Invoke the editor, with a reasonable canned default.
+                    if { $editor == "" } { set editor "/usr/bin/vi" }
+                    if {[catch {eval exec >/dev/stdout </dev/stdin $editor $portfile} result]} {
+                        global errorInfo
+                        ui_debug "$errorInfo"
+                        break_softcontinue "unable to invoke editor $editor: $result" 1 status
                     }
                     
                     # Restore internal MacPorts environment

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080413/a8036f3b/attachment.html