Merge commit '5af307de43e4b65eec7f235b48a8908f2a00f134'

[bpt/guile.git] / meta / guild.in

diff --git a/meta/guild.in b/meta/guild.in
index be4e5b5..a68e0ff 100755 (executable)
--- a/meta/guild.in
+++ b/meta/guild.in
@@ -1,12 +1,12 @@
 #!/bin/sh
 # -*- scheme -*-
-exec guile $GUILE_FLAGS -e '(@@ (guild) main)' -s "$0" "$@"
+exec ${GUILE:-@installed_guile@} $GUILE_FLAGS -e '(@@ (guild) main)' -s "$0" "$@"
 !#
 
 ;;;; guild --- running scripts bundled with Guile
 ;;;; Andy Wingo <wingo@pobox.com> --- April 2009
 ;;;; 
-;;;;   Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
+;;;;   Copyright (C) 2009, 2010, 2011, 2013, 2014 Free Software Foundation, Inc.
 ;;;; 
 ;;;; This library is free software; you can redistribute it and/or
 ;;;; modify it under the terms of the GNU Lesser General Public
@@ -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+*))
 
@@ -49,7 +49,13 @@ exec guile $GUILE_FLAGS -e '(@@ (guild) main)' -s "$0" "$@"
 
 (define (main args)
   (if (defined? 'setlocale)
-      (setlocale LC_ALL ""))
+      (catch 'system-error
+        (lambda ()
+          (setlocale LC_ALL ""))
+        (lambda args
+          (format (current-error-port)
+                  "warning: failed to install locale: ~a~%"
+                  (strerror (system-error-errno args))))))
 
   (let* ((options (getopt-long args *option-grammar*
                                #:stop-at-first-non-option #t))