Changeset 37316 for trunk/base/src

Timestamp:

06/02/08 16:37:43 (6 months ago)

Author:

raimue@…

Message:

port/port.tcl, macports1.0/macports.tcl:
Use current terminal size instead of a hardcoded width. This uses the COLUMNS
environment variable which therefore should be preserved by the env cleanup in
macports.tcl. See #15488.

Location:

trunk/base/src

Files:

• macports1.0/macports.tcl (modified) (1 diff)
• port/port.tcl (modified) (7 diffs)

trunk/base/src/macports1.0/macports.tcl

@@ -659 +659 @@
         USER GROUP
         http_proxy HTTPS_PROXY FTP_PROXY ALL_PROXY NO_PROXY
+        COLUMNS LINES
     }
     if {[info exists extra_env]} {

trunk/base/src/port/port.tcl

@@ -398 +398 @@
 
 ##
+# Makes sure we get the current terminal size
+proc set_term_size {} {
+    global env
+
+    if {![info exists env(COLUMNS)] || ![info exists env(LINES)]} {
+        if {![catch {exec stty size} err]} {
+            regexp {(\d+) (\d+)} $err -> rows cols
+            set env(COLUMNS) $cols
+            set env(LINES) $rows
+        } else {
+            puts stderr "Warning: Unable to get terminal size, using 80x24!"
+            set cols 80
+            set rows 24
+        }
+    }
+}
+
+##
 # Wraps a multi-line string at specified textwidth
 #
@@ -403 +421 @@
 #
 # @param string input string
-# @param maxlen text width (indent length not counted)
+# @param maxlen text width (0 defaults to current terminal width)
 # @param indent prepend to every line
 # @return wrapped string
 proc wrap {string maxlen {indent ""} {indentfirstline 1}} {
+    global env
+
+    if {$maxlen == 0} {
+        set maxlen $env(COLUMNS)
+    }
+
     set splitstring {}
     foreach line [split $string "\n"] {
@@ -420 +444 @@
 #
 # @param line input line
-# @param maxlen text width (indent length not counted)
+# @param maxlen text width (0 defaults to current terminal width)
 # @param indent prepend to every line
 # @return wrapped string
 proc wrapline {line maxlen {indent ""} {indentfirstline 1}} {
+    global env
+
+    if {$maxlen == 0} {
+        set maxlen $env(COLUMNS)
+    }
+
     set string [split $line " "]
     if {$indentfirstline == 0} {
@@ -1184 +1214 @@
         set ret "Usage: "
         set len [string length $action]
-        append ret [wrap "$action$cmds$args" 80 [string repeat " " [expr 8 + $len]] 0]
+        append ret [wrap "$action$cmds$args" 0 [string repeat " " [expr 8 + $len]] 0]
         append ret "\n"
 
@@ -1411 +1441 @@
                 }
                 puts -nonewline "Variants:    "
-                puts [wrap $vars 80 [string repeat " " 13] 0]
+                puts [wrap $vars 0 [string repeat " " 13] 0]
             }
             puts ""
             if {[info exists portinfo(long_description)]} {
-                puts [wrap [join $portinfo(long_description)] 80]
+                puts [wrap [join $portinfo(long_description)] 0]
             } else {
                 if {[info exists portinfo(description)]} {
-                    puts [wrap [join $portinfo(description)] 80]
+                    puts [wrap [join $portinfo(description)] 0]
                 }
             }
@@ -2101 +2131 @@
                     }
                     puts ""
-                    puts [wrap [join $portinfo(description)] 80 [string repeat " " 4]]
+                    puts [wrap [join $portinfo(description)] 0 [string repeat " " 4]]
                 }
             }
@@ -3051 +3081 @@
 array set private_options {}
 
+# Make sure we get the size of the terminal
+# We do this here to save it in the boot_env, in case we determined it manually
+set_term_size
+
 # Save off a copy of the environment before mportinit monkeys with it
 global env boot_env