Changeset 14506 for trunk/base

Timestamp:

Oct 9, 2005, 3:31:28 PM (19 years ago)

Author:

jberry

Message:

Add new actions to port(1):

• path (emits the path to the port's directory)
• portfile (emits the path to the portfile)
• cat (copies the portfile to standard output)
• ed (invokes any editor specified in EDITOR or VISUAL on the portfile)

Based on a feature request by Juan.

Location:

trunk/base

Files:

• ChangeLog (modified) (2 diffs)
• src/port/port.tcl (modified) (5 diffs)

trunk/base/ChangeLog

@@ -1 +1 @@
 #
-#       $Id: ChangeLog,v 1.6 2005/10/09 13:54:26 jberry Exp $
+#       $Id: ChangeLog,v 1.7 2005/10/09 15:31:27 jberry Exp $
 #
 #       This is a log of major user-visible changes in each release
@@ -85 +85 @@
 
         - Snazzy new ChangeLog file
+        
+        - Add new actions for port(1): help, echo, cat, ed, path, portfile (jberry)
 
 

trunk/base/src/port/port.tcl

@@ -3 +3 @@
 exec @TCLSH@ "$0" "$@"
 # port.tcl
-# $Id: port.tcl,v 1.113 2005/10/08 22:24:14 jberry Exp $
+# $Id: port.tcl,v 1.114 2005/10/09 15:31:28 jberry Exp $
 #
 # Copyright (c) 2004 Robert Shaw <rshaw@opendarwin.org>
@@ -50 +50 @@
 array set global_variations     {}
 
+# Save off a copy of the environment before dportinit monkeys with it
+global env
+array set boot_env [array get env]
+
 # UI Instantiations
 # ui_options(ports_debug) - If set, output debugging messages.
@@ -127 +131 @@
     }
 }
+
 
 # Standard procedures
@@ -1694 +1699 @@
         }
         
-        sync {
-                if {[catch {dportsync} result]} {
-                        global errorInfo
-                        ui_debug "$errorInfo"
-                        fatal "port sync failed: $result"
-                }
-        }
-        
-        default {
+        ed      -
+        cat -
+        path -
+        portfile {
+                # Operations on the PortFiles of the port
                 require_portlist
                 foreachport $portlist {
-                        set target $action
-
                         # If we have a url, use that, since it's most specific
                         # otherwise try to map the portname to a url
@@ -1723 +1722 @@
                         }
                         
+                        set portdir [darwinports::getportdir $porturl $portdir]
+                        set portfile "${portdir}/PortFile"
+                        
+                        if {[file readable $portfile]} {
+                                switch -- $action {
+                                        cat     {
+                                                # Copy the portfile to standard output
+                                                set f [open $portfile RDONLY]
+                                                while { ![eof $f] } {
+                                                        puts [read $f 4096]
+                                                }
+                                                close $f
+                                        }
+                                        
+                                        ed {
+                                                # Find an editor to edit the portfile
+                                                set editor ""
+                                                foreach ed { VISUAL EDITOR } {
+                                                        if {[info exists boot_env($ed)]} {
+                                                                set editor $boot_env($ed)
+                                                        }
+                                                }
+                                                
+                                                if { $editor == "" } {
+                                                        fatal "No EDITOR is specified in your environment"
+                                                } else {
+                                                        eval exec $editor $portfile
+                                                }                                               
+                                        }
+                                        
+                                        path {
+                                                # output the path to the port
+                                                puts $portdir
+                                        }
+
+                                        portfile {
+                                                # output the path to the portfile
+                                                puts $portfile
+                                        }
+                                }
+                        } else {
+                                fatal_softcontinue "Could not read $portfile"
+                        }
+                }
+        }
+        
+        sync {
+                if {[catch {dportsync} result]} {
+                        global errorInfo
+                        ui_debug "$errorInfo"
+                        fatal "port sync failed: $result"
+                }
+        }
+        
+        default {
+                require_portlist
+                foreachport $portlist {
+                        set target $action
+
+                        # If we have a url, use that, since it's most specific
+                        # otherwise try to map the portname to a url
+                        if {$porturl == ""} {
+                                # Verify the portname, getting portinfo to map to a porturl
+                                if {[catch {set res [dportsearch $portname no exact]} result]} {
+                                        global errorInfo
+                                        ui_debug "$errorInfo"
+                                        fatal_softcontinue "search for portname $portname failed: $result"
+                                }
+                                if {[llength $res] < 2} {
+                                        fatal_softcontinue "Port $portname not found"
+                                }
+                                array set portinfo [lindex $res 1]
+                                set porturl $portinfo(porturl)
+                        }
+                        
                         # If this is the install target, add any global_variations to the variations
                         # specified for the port