diff options
author | Ludovic Courtès <ludo@gnu.org> | 2011-07-23 22:43:08 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2011-07-23 22:43:38 +0200 |
commit | 0d2e3fc1e7095c7b64845b29ff01e2077329f127 (patch) | |
tree | ec4904e8a847ee87ebd81f2bb2b10669719c3128 | |
parent | 8698e810078e3224e08a67540fd42ad51b46fdf1 (diff) | |
download | guile-0d2e3fc1e7095c7b64845b29ff01e2077329f127.tar.gz |
Change `guild --help' and `--version' output to be more GNUish.
* meta/guild.in (display-version): Display the version, not the
effective version.
* module/scripts/help.scm (list-commands)[help]: Add proper footer, as
per the GCS.
-rwxr-xr-x | meta/guild.in | 4 | ||||
-rw-r--r-- | module/scripts/help.scm | 14 |
2 files changed, 10 insertions, 8 deletions
diff --git a/meta/guild.in b/meta/guild.in index be4e5b5a3..17edf6019 100755 --- a/meta/guild.in +++ b/meta/guild.in @@ -39,8 +39,8 @@ exec guile $GUILE_FLAGS -e '(@@ (guild) main)' -s "$0" "$@" (version (single-char #\v)))) (define (display-version) - (version-etc "GNU Guile" - (effective-version) + (version-etc "@PACKAGE_NAME@" + (version) #:command-name "guild" #:license *LGPLv3+*)) diff --git a/module/scripts/help.scm b/module/scripts/help.scm index e015ad532..107d39485 100644 --- a/module/scripts/help.scm +++ b/module/scripts/help.scm @@ -85,10 +85,7 @@ (define (list-commands all?) (display "\ Usage: guild COMMAND [ARGS] - - guild runs command-line scripts provided by GNU Guile and related - programs. See \"Using Guile Tools\" in the Guile manual, for more - information. +Run command-line scripts provided by GNU Guile and related programs. Commands: ") @@ -107,9 +104,14 @@ Commands: (format #t " ~A ~23t~a\n" name summary) (format #t " ~A\n" name))))) (find-submodules '(scripts))) - (display " + (format #t " For help on a specific command, try \"guild help COMMAND\". -")) + +Report guild bugs to ~a +GNU Guile home page: <http://www.gnu.org/software/guile/> +General help using GNU software: <http://www.gnu.org/gethelp/> +For complete documentation, run: info guile 'Using Guile Tools' +" %guile-bug-report-address)) (define (module-commentary mod) (file-commentary |