summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2011-07-25 18:26:37 +0200
committerAndy Wingo <wingo@pobox.com>2011-07-25 18:26:37 +0200
commitab4bc85398a14b62b58694bab83c63be286b2fd5 (patch)
tree84bfe7b0b6064016bcfadb76ec95d07410654fe8 /meta
parentf29c300507da21a667f5b82e75300f8009eab9cc (diff)
parentf4b7d918eff9770f09893b023fd834f5c0bc33d1 (diff)
downloadguile-ab4bc85398a14b62b58694bab83c63be286b2fd5.tar.gz
Merge remote-tracking branch 'origin/stable-2.0'
Conflicts: GUILE-VERSION test-suite/tests/srfi-4.test
Diffstat (limited to 'meta')
-rwxr-xr-xmeta/guild.in56
-rw-r--r--meta/uninstalled-env.in4
2 files changed, 26 insertions, 34 deletions
diff --git a/meta/guild.in b/meta/guild.in
index bb9c37e05..183323f75 100755
--- a/meta/guild.in
+++ b/meta/guild.in
@@ -1,6 +1,8 @@
#!/bin/sh
# -*- scheme -*-
-exec guile $GUILE_FLAGS -e '(@@ (guild) main)' -s "$0" "$@"
+prefix="@prefix@"
+exec_prefix="@exec_prefix@"
+exec ${GUILE:-@bindir@/@guile_program_name@} $GUILE_FLAGS -e '(@@ (guild) main)' -s "$0" "$@"
!#
;;;; guild --- running scripts bundled with Guile
@@ -25,6 +27,7 @@ exec guile $GUILE_FLAGS -e '(@@ (guild) main)' -s "$0" "$@"
(define-module (guild)
#:use-module (ice-9 getopt-long)
+ #:use-module (ice-9 command-line)
#:autoload (ice-9 format) (format))
;; Hack to provide scripts with the bug-report address.
@@ -37,23 +40,11 @@ exec guile $GUILE_FLAGS -e '(@@ (guild) main)' -s "$0" "$@"
'((help (single-char #\h))
(version (single-char #\v))))
-(define (display-help)
- (display "\
-Usage: guild --version
- guild --help
- guild PROGRAM [ARGS]
-
-If PROGRAM is \"list\" or omitted, display available scripts, otherwise
-PROGRAM is run with ARGS.
-"))
-
(define (display-version)
- (format #t "guild (GNU Guile ~A) ~A
-Copyright (C) 2010 Free Software Foundation, Inc.
-License LGPLv3+: GNU LGPL version 3 or later <http://gnu.org/licenses/lgpl.html>
-This is free software: you are free to change and redistribute it.
-There is NO WARRANTY, to the extent permitted by law.
-" (version) (effective-version)))
+ (version-etc "@PACKAGE_NAME@"
+ (version)
+ #:command-name "guild"
+ #:license *LGPLv3+*))
(define (find-script s)
(resolve-module (list 'scripts (string->symbol s)) #:ensure #f))
@@ -62,27 +53,24 @@ There is NO WARRANTY, to the extent permitted by law.
(if (defined? 'setlocale)
(setlocale LC_ALL ""))
- (let ((options (getopt-long args *option-grammar*
- #:stop-at-first-non-option #t)))
+ (let* ((options (getopt-long args *option-grammar*
+ #:stop-at-first-non-option #t))
+ (args (option-ref options '() '())))
(cond
((option-ref options 'help #f)
- (display-help)
+ (apply (module-ref (resolve-module '(scripts help)) 'main) args)
(exit 0))
((option-ref options 'version #f)
(display-version)
(exit 0))
+ ((find-script (if (null? args) "help" (car args)))
+ => (lambda (mod)
+ (exit (apply (module-ref mod 'main) (if (null? args)
+ '()
+ (cdr args))))))
(else
- (let ((args (option-ref options '() '())))
- (cond ((find-script (if (null? args)
- "list"
- (car args)))
- => (lambda (mod)
- (exit (apply (module-ref mod 'main) (if (null? args)
- '()
- (cdr args))))))
- (else
- (format (current-error-port)
- "guild: unknown script ~s~%" (car args))
- (format (current-error-port)
- "Try `guild --help' for more information.~%")
- (exit 1))))))))
+ (format (current-error-port)
+ "guild: unknown script ~s~%" (car args))
+ (format (current-error-port)
+ "Try `guild help' for more information.~%")
+ (exit 1)))))
diff --git a/meta/uninstalled-env.in b/meta/uninstalled-env.in
index 4faad641b..2276b4aed 100644
--- a/meta/uninstalled-env.in
+++ b/meta/uninstalled-env.in
@@ -136,4 +136,8 @@ if test "x${top_srcdir}" != "x${top_builddir}"; then
fi
export PATH
+# Define $GUILE, used by `guild'.
+GUILE="${top_builddir}/meta/guile"
+export GUILE
+
exec "$@"