From 22470e414713ab34f653fb96f062338abfb3d334 Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Sat, 24 Apr 2010 07:17:53 -0600
Subject: [PATCH] racket-tool -> raco

---
 collects/compiler/commands/c-ext.ss     | 2 +-
 collects/compiler/commands/decompile.ss | 2 +-
 collects/compiler/commands/exe-dir.ss   | 2 +-
 collects/compiler/commands/exe.ss       | 2 +-
 collects/compiler/commands/expand.ss    | 2 +-
 collects/compiler/commands/info.ss      | 2 +-
 collects/compiler/commands/make.ss      | 2 +-
 collects/compiler/commands/pack.ss      | 2 +-
 collects/help/help.ss                   | 4 +++-
 collects/help/info.ss                   | 2 +-
 collects/help/installer.ss              | 2 +-
 collects/meta/dist-specs.ss             | 4 ++--
 collects/planet/info.ss                 | 2 +-
 collects/planet/planet.ss               | 2 +-
 collects/{tool => raco}/all-tools.ss    | 6 +++---
 collects/{tool => raco}/command-name.ss | 0
 collects/{tool => raco}/info.ss         | 2 +-
 collects/{tool => raco}/main.lch        | 0
 collects/{tool => raco}/main.ss         | 4 ++--
 collects/{tool/tool.ss => raco/raco.ss} | 6 +++---
 collects/scribble/info.ss               | 2 +-
 collects/scribble/run.ss                | 2 +-
 collects/setup/info.ss                  | 2 +-
 collects/setup/setup-cmdline.ss         | 6 +++---
 src/Makefile.in                         | 2 +-
 25 files changed, 33 insertions(+), 31 deletions(-)
 rename collects/{tool => raco}/all-tools.ss (85%)
 rename collects/{tool => raco}/command-name.ss (100%)
 rename collects/{tool => raco}/info.ss (69%)
 rename collects/{tool => raco}/main.lch (100%)
 rename collects/{tool => raco}/main.ss (85%)
 rename collects/{tool/tool.ss => raco/raco.ss} (92%)

diff --git a/collects/compiler/commands/c-ext.ss b/collects/compiler/commands/c-ext.ss
index 44456ab4f9..22bc5db193 100644
--- a/collects/compiler/commands/c-ext.ss
+++ b/collects/compiler/commands/c-ext.ss
@@ -7,7 +7,7 @@
 
 (require (prefix-in compiler:option: "../option.ss")
          "../compiler.ss"
-         tool/command-name
+         raco/command-name
          mzlib/cmdline
          dynext/file
          dynext/compile
diff --git a/collects/compiler/commands/decompile.ss b/collects/compiler/commands/decompile.ss
index 8b16b48434..0bc201d044 100644
--- a/collects/compiler/commands/decompile.ss
+++ b/collects/compiler/commands/decompile.ss
@@ -1,6 +1,6 @@
 #lang scheme/base
 (require scheme/cmdline
-         tool/command-name
+         raco/command-name
          compiler/zo-parse
          compiler/decompile
          scheme/pretty)
diff --git a/collects/compiler/commands/exe-dir.ss b/collects/compiler/commands/exe-dir.ss
index 95f28d1aee..dae09d1438 100644
--- a/collects/compiler/commands/exe-dir.ss
+++ b/collects/compiler/commands/exe-dir.ss
@@ -1,6 +1,6 @@
 #lang scheme/base
 (require scheme/cmdline
-         tool/command-name
+         raco/command-name
          compiler/distribute)
 
 (define verbose (make-parameter #f))
diff --git a/collects/compiler/commands/exe.ss b/collects/compiler/commands/exe.ss
index 762df0ff2b..59a956f60f 100644
--- a/collects/compiler/commands/exe.ss
+++ b/collects/compiler/commands/exe.ss
@@ -1,6 +1,6 @@
 #lang scheme/base
 (require scheme/cmdline
-         tool/command-name
+         raco/command-name
          compiler/private/embed
          dynext/file)
 
diff --git a/collects/compiler/commands/expand.ss b/collects/compiler/commands/expand.ss
index ed742087c1..181b79b1c3 100644
--- a/collects/compiler/commands/expand.ss
+++ b/collects/compiler/commands/expand.ss
@@ -1,6 +1,6 @@
 #lang scheme/base
 (require scheme/cmdline
-         tool/command-name
+         raco/command-name
          scheme/pretty)
 
 (define source-files
diff --git a/collects/compiler/commands/info.ss b/collects/compiler/commands/info.ss
index a2fef6dcbd..732470021c 100644
--- a/collects/compiler/commands/info.ss
+++ b/collects/compiler/commands/info.ss
@@ -1,6 +1,6 @@
 #lang setup/infotab
 
-(define racket-tools
+(define raco-commands
   '(("make" compiler/commands/make "compile source to bytecode" 100)
     ("exe" compiler/commands/exe "create executable" 20)
     ("pack" compiler/commands/pack "pack files/collections into a .plt archive" 10)
diff --git a/collects/compiler/commands/make.ss b/collects/compiler/commands/make.ss
index 61336ce1e4..20b8ea9c5f 100644
--- a/collects/compiler/commands/make.ss
+++ b/collects/compiler/commands/make.ss
@@ -1,6 +1,6 @@
 #lang scheme/base
 (require scheme/cmdline
-         tool/command-name
+         raco/command-name
          compiler/cm
          "../compiler.ss"
          dynext/file)
diff --git a/collects/compiler/commands/pack.ss b/collects/compiler/commands/pack.ss
index add2f667b1..852ee99d74 100644
--- a/collects/compiler/commands/pack.ss
+++ b/collects/compiler/commands/pack.ss
@@ -1,6 +1,6 @@
 #lang scheme/base
 (require scheme/cmdline
-         tool/command-name
+         raco/command-name
          setup/pack
          setup/getinfo
          compiler/distribute)
diff --git a/collects/help/help.ss b/collects/help/help.ss
index 340a7a7c20..039a343837 100644
--- a/collects/help/help.ss
+++ b/collects/help/help.ss
@@ -1,10 +1,12 @@
 #lang scheme/base
 
-(require "search.ss" scheme/cmdline scheme/list scheme/string)
+(require "search.ss" scheme/cmdline scheme/list scheme/string
+         raco/command-name) 
 
 ;; Minimal command-line arguments, the query string can contain all
 ;; kinds of magic.
 (command-line
+ #:program (short-program+command-name)
  #:handlers
  (lambda (_ . ts)
    (if (null? ts)
diff --git a/collects/help/info.ss b/collects/help/info.ss
index 8d3e9814ac..d2f4cd6ae0 100644
--- a/collects/help/info.ss
+++ b/collects/help/info.ss
@@ -1,4 +1,4 @@
 #lang setup/infotab
 
 (define post-install-collection "installer.ss")
-(define racket-tools '(("docs" help/help "search and view documentation" 100)))
+(define raco-commands '(("docs" help/help "search and view documentation" 100)))
diff --git a/collects/help/installer.ss b/collects/help/installer.ss
index cd1f5959ed..9507d8646a 100644
--- a/collects/help/installer.ss
+++ b/collects/help/installer.ss
@@ -27,7 +27,7 @@
       (parameterize ([current-launcher-variant variant])
         (mk-launcher '("-l-" "help/help")
                      (mk-path "plt-help")       ;; change to "Racket Docs"
-                     `([exe-name . "plt-help"]  ;; get rid of this (in favor of 'racket-tool docs')
+                     `([exe-name . "plt-help"]  ;; get rid of this (in favor of 'raco docs')
                        [relative? . #t]
                        [framework-root . #f]
                        [dll-dir . #f]
diff --git a/collects/meta/dist-specs.ss b/collects/meta/dist-specs.ss
index d1079e3539..6dd42893ab 100644
--- a/collects/meta/dist-specs.ss
+++ b/collects/meta/dist-specs.ss
@@ -431,8 +431,8 @@ platform-dependent := ; hook for package rules
 mz-extras :+= (- (package: "setup-plt" #:collection "setup/")
                  (cond (not dr) => (srcfile: "plt-installer{|-sig|-unit}.ss")))
 
-;; -------------------- racket-tool
-mz-extras :+= (package: "tool")
+;; -------------------- raco
+mz-extras :+= (package: "raco")
 
 ;; -------------------- launcher
 mz-extras :+= (- (collects: "launcher")
diff --git a/collects/planet/info.ss b/collects/planet/info.ss
index b39b69aa6a..b27175645e 100644
--- a/collects/planet/info.ss
+++ b/collects/planet/info.ss
@@ -5,4 +5,4 @@
 (define mzscheme-launcher-libraries '("planet.ss"))
 (define scribblings '(("planet.scrbl" (multi-page) (tool))))
 
-(define racket-tools '(("planet" planet/planet "manage Planet package installations" 80)))
+(define raco-commands '(("planet" planet/planet "manage Planet package installations" 80)))
diff --git a/collects/planet/planet.ss b/collects/planet/planet.ss
index c1b84adfe6..2536551d89 100644
--- a/collects/planet/planet.ss
+++ b/collects/planet/planet.ss
@@ -11,7 +11,7 @@ PLANNED FEATURES:
            (only mzlib/list sort)
            net/url
            mzlib/match
-           tool/command-name
+           raco/command-name
            
            "config.ss"
            "private/planet-shared.ss"
diff --git a/collects/tool/all-tools.ss b/collects/raco/all-tools.ss
similarity index 85%
rename from collects/tool/all-tools.ss
rename to collects/raco/all-tools.ss
index d47ac7632e..b877f3ee71 100644
--- a/collects/tool/all-tools.ss
+++ b/collects/raco/all-tools.ss
@@ -4,11 +4,11 @@
 (provide all-tools)
 
 (define (all-tools)
-  (let* ([dirs (find-relevant-directories '(racket-tools))]
+  (let* ([dirs (find-relevant-directories '(raco-commands))]
          [tools (make-hash)])
     (for ([i (in-list (map get-info/full dirs))]
           [d (in-list dirs)])
-      (let ([entries (let ([l (i 'racket-tools (lambda () null))])
+      (let ([entries (let ([l (i 'raco-commands (lambda () null))])
                        (if (list? l)
                            l
                            (list l)))])
@@ -33,7 +33,7 @@
            [else
             (fprintf
              (current-error-port)
-             "warning: ~s provided bad `racket-tools' spec: ~e"
+             "warning: ~s provided bad `raco-commands' spec: ~e"
              d
              entry)]))))
     tools))
diff --git a/collects/tool/command-name.ss b/collects/raco/command-name.ss
similarity index 100%
rename from collects/tool/command-name.ss
rename to collects/raco/command-name.ss
diff --git a/collects/tool/info.ss b/collects/raco/info.ss
similarity index 69%
rename from collects/tool/info.ss
rename to collects/raco/info.ss
index d3177af88f..62887e73b9 100644
--- a/collects/tool/info.ss
+++ b/collects/raco/info.ss
@@ -3,4 +3,4 @@
 (define compile-omit-paths '("main.ss"))
 
 (define racket-launcher-libraries '("main.ss"))
-(define racket-launcher-names '("racket-tool"))
+(define racket-launcher-names '("raco"))
diff --git a/collects/tool/main.lch b/collects/raco/main.lch
similarity index 100%
rename from collects/tool/main.lch
rename to collects/raco/main.lch
diff --git a/collects/tool/main.ss b/collects/raco/main.ss
similarity index 85%
rename from collects/tool/main.ss
rename to collects/raco/main.ss
index 6a95d0e59c..335ed7c379 100644
--- a/collects/tool/main.ss
+++ b/collects/raco/main.ss
@@ -1,5 +1,5 @@
 
-;; Because `racket-tool setup' is used to rebuild .zos, check for "setup"
+;; Because `raco setup' is used to rebuild .zos, check for "setup"
 ;; directly.
 
 ;; Note that this file is listed in "info.ss" so that it never gets a
@@ -19,4 +19,4 @@
                          (cdr
                           (vector->list cmdline)))])
           (dynamic-require 'setup/main #f))
-        (dynamic-require 'tool/tool #f))))
+        (dynamic-require 'raco/raco #f))))
diff --git a/collects/tool/tool.ss b/collects/raco/raco.ss
similarity index 92%
rename from collects/tool/tool.ss
rename to collects/raco/raco.ss
index dca3d2c8d6..9d29d1dcb8 100644
--- a/collects/tool/tool.ss
+++ b/collects/raco/raco.ss
@@ -54,7 +54,7 @@
                   (find-system-path 'run-file)
                   (car cmdline))
          #f])])
-  (fprintf (current-error-port) "Usage: racket-tool <command> <option> ... <arg> ...\n\n")
+  (fprintf (current-error-port) "Usage: raco <command> <option> ... <arg> ...\n\n")
   (fprintf (current-error-port) "~a commands:\n" (if show-all? 
                                                      "Available"
                                                      "Frequently used"))
@@ -72,7 +72,7 @@
                      (caddr i))))))
     (printf "\nA command can be specified by an unambigous prefix.")
     (unless show-all?
-      (printf "\nSee `racket-tool --help' for a complete list of commands."))
-    (printf "\nSee `racket-tool <command> --help' for help on a command.")
+      (printf "\nSee `raco --help' for a complete list of commands."))
+    (printf "\nSee `raco <command> --help' for help on a command.")
     (newline)
     (exit (if show-all? 0 1)))
diff --git a/collects/scribble/info.ss b/collects/scribble/info.ss
index 708c8550d7..5d0130f022 100644
--- a/collects/scribble/info.ss
+++ b/collects/scribble/info.ss
@@ -4,6 +4,6 @@
 (define mzscheme-launcher-libraries '("run.ss"))
 (define compile-omit-paths '("test-reader.ss"))
 
-(define racket-tools
+(define raco-commands
   '(("scribble" scribble/run "render a Scribble document" #f)))
 
diff --git a/collects/scribble/run.ss b/collects/scribble/run.ss
index 31874f87cb..e5d35d32a4 100644
--- a/collects/scribble/run.ss
+++ b/collects/scribble/run.ss
@@ -6,7 +6,7 @@
          scheme/cmdline
          scheme/file
          scheme/class
-         tool/command-name
+         raco/command-name
          (prefix-in text:  "text-render.ss")
          (prefix-in html:  "html-render.ss")
          (prefix-in latex: "latex-render.ss")
diff --git a/collects/setup/info.ss b/collects/setup/info.ss
index d1e201b468..8efbf153ee 100644
--- a/collects/setup/info.ss
+++ b/collects/setup/info.ss
@@ -5,4 +5,4 @@
 (define mzscheme-launcher-libraries '("main.ss"))
 (define mzscheme-launcher-names '("Setup PLT"))
 
-(define racket-tools '(("setup" setup/main "install and build libraries and documentation" 90)))
+(define raco-commands '(("setup" setup/main "install and build libraries and documentation" 90)))
diff --git a/collects/setup/setup-cmdline.ss b/collects/setup/setup-cmdline.ss
index a2081f17ce..b36b69eb5b 100644
--- a/collects/setup/setup-cmdline.ss
+++ b/collects/setup/setup-cmdline.ss
@@ -6,7 +6,7 @@
 #lang scheme/base
 
 (require scheme/cmdline
-         tool/command-name)
+         raco/command-name)
 
 (provide parse-cmdline)
 
@@ -31,9 +31,9 @@
          [(current-command-name)
           (values (format "~a ~a" name (current-command-name))
                   (program+command-name))]
-         ;; Hack for bootstrapping, if the program name is "racket-tool",
+         ;; Hack for bootstrapping, if the program name is "raco",
          ;; then claim to be the "setup" command:
-         [(equal? (path->string name) "racket-tool")
+         [(equal? (path->string name) "raco")
           (values (format "~a setup" name)
                   (format "~a setup" p))]
          [else
diff --git a/src/Makefile.in b/src/Makefile.in
index c28f2b647f..29a7b2225f 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -54,7 +54,7 @@ both:
 
 # Install (common) ----------------------------------------
 
-SETUP_ARGS = -X "$(DESTDIR)$(collectsdir)" -N "rico setup" -l setup
+SETUP_ARGS = -X "$(DESTDIR)$(collectsdir)" -N "raco setup" -l setup
 
 install:
 	$(MAKE) install-@MAIN_VARIANT@