Changeset 14588 for trunk/base

Timestamp:

Oct 13, 2005, 12:59:16 AM (19 years ago)

Author:

jberry

Message:

• Make a cmdname global to carry the shortened argv0
• Use this instead of repeatedly coming to the same conclusion
• Add our cmdname to --version message to make it a bit more clear, in a nod to Joe Auty, but without going into toooo much detail.

File:

• trunk/base/src/port/port.tcl (modified) (5 diffs)

trunk/base/src/port/port.tcl

@@ -3 +3 @@
 exec @TCLSH@ "$0" "$@"
 # port.tcl
-# $Id: port.tcl,v 1.133 2005/10/12 22:36:18 jberry Exp $
+# $Id: port.tcl,v 1.134 2005/10/13 00:59:16 jberry Exp $
 #
 # Copyright (c) 2004 Robert Shaw <rshaw@opendarwin.org>
@@ -54 +54 @@
 array set boot_env [array get env]
 
+global argv0
+set cmdname [file tail $argv0]
+
 # UI Instantiations
 # ui_options(ports_debug) - If set, output debugging messages.
@@ -135 +138 @@
 # Standard procedures
 proc print_usage args {
-        global argv0
-        set cmd [file tail $argv0]
+        global cmdname
         set usage { [-vdqfonasbckt] [-D portdir] [-u porturl] action [actionflags]
 [[portname|pseudo-portname|port-url] [version] [+-variant]... [option=value]...]...
 }
                 
-        puts "Usage: $cmd $usage"
-        puts "\"$cmd help\" or \"man 1 port\" for more information."
+        puts "Usage: $cmdname$usage"
+        puts "\"$cmdname help\" or \"man 1 port\" for more information."
 }
 
 
 proc print_help args {
-        global argv0
+        global cmdname
         
         set help { [-vdqfonasbckt] [-D portdir] [-u porturl] action [actionflags]
@@ -186 +188 @@
         }
         
-        puts "[file tail $argv0]$help"
+        puts "$cmdname$help"
 }
 
@@ -1075 +1077 @@
                 # Process long arguments
                 switch -- $arg {
-                        --version       { ui_warn {(please use "version" to get version information)}; set action "version" }
+                        --version       { ui_warn "(please use \"$cmdname version\" to get version information)"; set action "version" }
                         default         { print_usage; exit 1 }
                 }