updating guile-tools: no more --scriptsdir

[Thien-Thi Nguyen]

Greetings,

Please find below a patch, first in a short series, to update the guile-tools
script.  I figure this is the best way to start harmonizing Guile 1.4.x and
official Guile.  Please let me know if you would prefer it in some other
format.

thi

___________________________________________________

>From 7006105990993e39e8a248d1203eebc0be42ef1c Mon Sep 17 00:00:00 2001
From: Thien-Thi Nguyen <address@hidden>
Date: Wed, 16 Jul 2008 11:50:28 +0200
Subject: [PATCH] Remove support for "guile-tools --scriptsdir".

* guile-tools.in: Delete "--scriptsdir" handling.
(help): Update.

Signed-off-by: Thien-Thi Nguyen <address@hidden>
---
 ChangeLog      |    7 +++++++
 guile-tools.in |   11 +----------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index da26cbf..0b58be4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-07-16  Thien-Thi Nguyen  <address@hidden>
+
+       Remove support for "guile-tools --scriptsdir".
+
+       * guile-tools.in: Delete "--scriptsdir" handling.
+       (help): Update.
+
 2008-07-06  Ludovic Courtès  <address@hidden>
 
        * configure.in: Update to Autoconf 2.61.
diff --git a/guile-tools.in b/guile-tools.in
index a4db08f..50444f0 100644
--- a/guile-tools.in
+++ b/guile-tools.in
@@ -34,7 +34,6 @@ Usage: guile-tools --version
 
 If PROGRAM is "list" or omitted, display contents of scripts dir, otherwise
 PROGRAM is run w/ ARGS.  Options (only one of which may be used at a time):
- --scriptsdir DIR    -- Look in DIR for scripts
  --guileversion VERS -- Look in $pkgdatadir/VERS/scripts for scripts
  --source            -- Display PROGRAM source (ignore ARGS) to stdout
 
@@ -53,10 +52,6 @@ if [ -d "$mydir/scripts" -a -f "$mydir/scripts/Makefile.am" 
] ; then
     default_scriptsdir=`(cd $mydir/scripts ; pwd)`
 fi
 
-# option processing -- basically, you can override either the script dir
-# completely, or just the guile version.  we choose implementation simplicity
-# over orthogonality.
-
 case x"$1" in
 x--version)
     echo $0 $guileversion
@@ -68,11 +63,7 @@ x--help)
     ;;
 esac
 
-if [ x"$1" = x--scriptsdir ] ; then
-    user_scriptsdir=$2
-    shift
-    shift
-elif [ x"$1" = x--guileversion ] ; then
+if [ x"$1" = x--guileversion ] ; then
     user_scriptsdir=$pkgdatadir/$2/scripts
     shift
     shift
-- 
1.5.3.5