guile/guile-core guile-tools.in

[Thien-Thi Nguyen]

CVSROOT:        /cvs
Module name:    guile
Branch:         branch_release-1-6
Changes by:     Thien-Thi Nguyen <address@hidden>       01/11/15 18:41:03

Modified files:
        guile-core     : guile-tools.in 

Log message:
        Handle command "list" specially: list scripts dir.
        
        (help): Make more informative.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/guile-tools.in.diff?cvsroot=OldCVS&only_with_tag=branch_release-1-6&tr1=1.1&tr2=1.1.4.1&r1=text&r2=text

Patches:
Index: guile/guile-core/guile-tools.in
diff -u guile/guile-core/guile-tools.in:1.1 guile/guile-core/guile-tools.in:1.2
--- guile/guile-core/guile-tools.in:1.1 Fri May  4 16:26:48 2001
+++ guile/guile-core/guile-tools.in     Thu Nov 15 18:36:05 2001
@@ -17,24 +17,30 @@
 # the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
 # Boston, MA 02111-1307 USA
 
-# Usage: guile-tools --version
-#        guile-tools --help
-#        guile-tools [OPTION] PROGRAM [ARGS]
+# Usage: See `help' func below.
 #
-# PROGRAM is run w/ ARGS.  To see a list of available programs, use
-# "guile-tools --help" to find the default scripts directory and then
-# do a "ls" on that directory.  Or just read the source 14 lines below.
-#
-# 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
-#
 # TODO
 # - handle pre-install invocation
 # - "full" option processing (but see comment below)
 #
 # Author: Thien-Thi Nguyen
 
+help ()
+{
+    cat <<EOF
+Usage: guile-tools --version
+       guile-tools --help
+       guile-tools [OPTION] PROGRAM [ARGS]
+
+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
+
+Default scripts dir: $default_scriptsdir
+EOF
+}
+
 prefix="@prefix@"
 pkgdatadir="@datadir@/@PACKAGE@"
 guileversion="@GUILE_VERSION@"
@@ -46,25 +52,20 @@
     default_scriptsdir=`(cd $mydir/scripts ; pwd)`
 fi
 
-help ()
-{
-    echo "$0 [--scriptsdir DIR | --guileversion VERSION] PROGRAM [ARGS]"
-    echo default scriptsdir: $default_scriptsdir
-}
-
 # option processing -- basically, you can override either the script dir
 # completely, or just the guile version.  we choose implementation simplicity
 # over orthogonality.
 
-if [ x"$1" = x--version ] ; then
+case x"$1" in
+x--version)
     echo $0 $guileversion
     exit 0
-fi
-
-if [ x"$1" = x--help -o x"$1" = x ] ; then
+    ;;
+x--help)
     help
     exit 0
-fi
+    ;;
+esac
 
 if [ x"$1" = x--scriptsdir ] ; then
     user_scriptsdir=$2
@@ -83,9 +84,9 @@
     exit 1
 fi
 
-if [ x"$1" = x ] ; then
-    help
-    exit 1
+if [ x"$1" = x -o x"$1" = xlist ] ; then
+    ls $scriptsdir
+    exit 0
 fi
 
 program=$scriptsdir/$1