From 6d66647d5b2c6649bb4dade734f6d583d10d797c Mon Sep 17 00:00:00 2001
From: Andy Wingo <wingo@pobox.com>
Date: Fri, 17 Apr 2009 11:19:42 +0200
Subject: [PATCH] guile-tools is a scheme script that loads scheme modules

* meta/guile-tools: Changed to be a scheme script. Instead of looking for
  executables in a "scripts dir", we just look for modules in (scripts),
  and load the modules directly.

* module/Makefile.am:
* module/scripts/: Move the scripts into module/ so they can be compiled.
  Rename scripts from `foo' to `foo.scm'.

* libguile/Makefile.am: Invoke the snarf->texi code via guile-tools.

* configure.in:
* .gitignore: Update for changes.
---
 .gitignore                                    |   1 -
 Makefile.am                                   |   2 +-
 configure.in                                  |   2 -
 libguile/Makefile.am                          |   2 +-
 meta/Makefile.am                              |   2 +-
 meta/guile-tools                              |  98 +++++++++++++++
 meta/guile-tools.in                           | 118 ------------------
 module/Makefile.am                            |  32 ++++-
 {scripts => module/scripts}/ChangeLog-2008    |   0
 scripts/PROGRAM => module/scripts/PROGRAM.scm |   5 -
 {scripts => module/scripts}/README            |   0
 .../api-diff => module/scripts/api-diff.scm   |   5 -
 .../autofrisk => module/scripts/autofrisk.scm |   5 -
 scripts/compile => module/scripts/compile.scm |   6 +-
 .../scripts/disassemble.scm                   |   6 +-
 .../scripts/display-commentary.scm            |   5 -
 .../doc-snarf => module/scripts/doc-snarf.scm |   5 -
 scripts/frisk => module/scripts/frisk.scm     |   5 -
 .../scripts/generate-autoload.scm             |   5 -
 scripts/lint => module/scripts/lint.scm       |   5 -
 scripts/punify => module/scripts/punify.scm   |   5 -
 .../scripts/read-rfc822.scm                   |   5 -
 .../scripts/read-scheme-source.scm            |   5 -
 .../scripts/read-text-outline.scm             |   5 -
 .../scan-api => module/scripts/scan-api.scm   |   5 -
 .../scripts/snarf-check-and-output-texi.scm   |   5 -
 .../scripts/snarf-guile-m4-docs.scm           |   5 -
 .../scripts/summarize-guile-TODO.scm          |   5 -
 scripts/use2dot => module/scripts/use2dot.scm |   5 -
 scripts/Makefile.am                           |  70 -----------
 30 files changed, 134 insertions(+), 290 deletions(-)
 create mode 100755 meta/guile-tools
 delete mode 100644 meta/guile-tools.in
 rename {scripts => module/scripts}/ChangeLog-2008 (100%)
 rename scripts/PROGRAM => module/scripts/PROGRAM.scm (82%)
 mode change 100755 => 100644
 rename {scripts => module/scripts}/README (100%)
 rename scripts/api-diff => module/scripts/api-diff.scm (97%)
 mode change 100755 => 100644
 rename scripts/autofrisk => module/scripts/autofrisk.scm (97%)
 mode change 100755 => 100644
 rename scripts/compile => module/scripts/compile.scm (98%)
 mode change 100755 => 100644
 rename scripts/disassemble => module/scripts/disassemble.scm (92%)
 mode change 100755 => 100644
 rename scripts/display-commentary => module/scripts/display-commentary.scm (90%)
 mode change 100755 => 100644
 rename scripts/doc-snarf => module/scripts/doc-snarf.scm (98%)
 mode change 100755 => 100644
 rename scripts/frisk => module/scripts/frisk.scm (98%)
 mode change 100755 => 100644
 rename scripts/generate-autoload => module/scripts/generate-autoload.scm (96%)
 mode change 100755 => 100644
 rename scripts/lint => module/scripts/lint.scm (97%)
 mode change 100755 => 100644
 rename scripts/punify => module/scripts/punify.scm (92%)
 mode change 100755 => 100644
 rename scripts/read-rfc822 => module/scripts/read-rfc822.scm (95%)
 mode change 100755 => 100644
 rename scripts/read-scheme-source => module/scripts/read-scheme-source.scm (98%)
 mode change 100755 => 100644
 rename scripts/read-text-outline => module/scripts/read-text-outline.scm (97%)
 mode change 100755 => 100644
 rename scripts/scan-api => module/scripts/scan-api.scm (97%)
 mode change 100755 => 100644
 rename scripts/snarf-check-and-output-texi => module/scripts/snarf-check-and-output-texi.scm (97%)
 mode change 100755 => 100644
 rename scripts/snarf-guile-m4-docs => module/scripts/snarf-guile-m4-docs.scm (92%)
 mode change 100755 => 100644
 rename scripts/summarize-guile-TODO => module/scripts/summarize-guile-TODO.scm (97%)
 mode change 100755 => 100644
 rename scripts/use2dot => module/scripts/use2dot.scm (94%)
 mode change 100755 => 100644
 delete mode 100644 scripts/Makefile.am

diff --git a/.gitignore b/.gitignore
index 3aa1f0471..0b2ff7cf2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -53,7 +53,6 @@ conftest.c
 depcomp
 elisp-comp
 guile-*.tar.gz
-guile-tools
 install-sh
 libtool
 ltconfig
diff --git a/Makefile.am b/Makefile.am
index 0e61f531d..a82143b78 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,7 +25,7 @@
 AUTOMAKE_OPTIONS = 1.10
 
 SUBDIRS = lib meta libguile guile-readline emacs \
-	  scripts srfi doc examples test-suite benchmark-suite lang am \
+	  srfi doc examples test-suite benchmark-suite lang am \
 	  module testsuite
 
 include_HEADERS = libguile.h
diff --git a/configure.in b/configure.in
index e547ff00e..354e93c54 100644
--- a/configure.in
+++ b/configure.in
@@ -1537,7 +1537,6 @@ AC_CONFIG_FILES([
   examples/Makefile
   lang/Makefile
   libguile/Makefile
-  scripts/Makefile
   srfi/Makefile
   test-suite/Makefile
   test-suite/standalone/Makefile
@@ -1556,7 +1555,6 @@ AC_CONFIG_FILES([meta/guile-1.8.pc])
 AC_CONFIG_FILES([meta/guile-1.8-uninstalled.pc])
 AC_CONFIG_FILES([check-guile], [chmod +x check-guile])
 AC_CONFIG_FILES([benchmark-guile], [chmod +x benchmark-guile])
-AC_CONFIG_FILES([meta/guile-tools], [chmod +x meta/guile-tools])
 AC_CONFIG_FILES([meta/guile], [chmod +x meta/guile])
 AC_CONFIG_FILES([meta/uninstalled-env], [chmod +x meta/uninstalled-env])
 AC_CONFIG_FILES([meta/gdb-uninstalled-guile], [chmod +x meta/gdb-uninstalled-guile])
diff --git a/libguile/Makefile.am b/libguile/Makefile.am
index 8f26e34d2..369b24951 100644
--- a/libguile/Makefile.am
+++ b/libguile/Makefile.am
@@ -329,7 +329,7 @@ load.x: libpath.h
 include $(top_srcdir)/am/pre-inst-guile
 
 alldotdocfiles    = $(DOT_DOC_FILES) $(EXTRA_DOT_DOC_FILES)
-snarf2checkedtexi = GUILE="$(GUILE_FOR_BUILD)" $(top_srcdir)/scripts/snarf-check-and-output-texi
+snarf2checkedtexi = $(top_builddir)/meta/uninstalled-env guile-tools snarf-check-and-output-texi
 dotdoc2texi       = cat $(alldotdocfiles) | $(snarf2checkedtexi)
 
 guile.texi: $(alldotdocfiles) guile$(EXEEXT)
diff --git a/meta/Makefile.am b/meta/Makefile.am
index da587e33d..6614ab349 100644
--- a/meta/Makefile.am
+++ b/meta/Makefile.am
@@ -21,7 +21,7 @@
 ##   Floor, Boston, MA 02110-1301 USA
 
 bin_SCRIPTS=guile-config guile-tools
-EXTRA_DIST=guile-tools.in guile.m4 ChangeLog-2008 \
+EXTRA_DIST=guile.m4 ChangeLog-2008 \
 	guile-1.8.pc.in guile-1.8-uninstalled.pc.in
 
 pkgconfigdir = $(libdir)/pkgconfig
diff --git a/meta/guile-tools b/meta/guile-tools
new file mode 100755
index 000000000..6df88effa
--- /dev/null
+++ b/meta/guile-tools
@@ -0,0 +1,98 @@
+#!/bin/sh
+# -*- scheme -*-
+exec guile $GUILE_FLAGS -e '(@@ (guile-tools) main)' -s "$0" "$@"
+!#
+
+;;;; guile-tools --- running scripts bundled with Guile
+;;;; Jim Blandy <jim@red-bean.com> --- September 1997
+;;;; 
+;;;; 	Copyright (C) 1998, 2001, 2004, 2005, 2006, 2008, 2009 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
+;;;; License as published by the Free Software Foundation; either
+;;;; version 2.1 of the License, or (at your option) any later version.
+;;;; 
+;;;; This library is distributed in the hope that it will be useful,
+;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;;;; Lesser General Public License for more details.
+;;;; 
+;;;; You should have received a copy of the GNU Lesser General Public
+;;;; License along with this library; if not, write to the Free Software
+;;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+(define-module (guile-tools)
+  #:use-module (srfi srfi-1))
+
+(define (help)
+  (display "\
+Usage: guile-tools --version
+       guile-tools --help
+       guile-tools PROGRAM [ARGS]
+
+If PROGRAM is \"list\" or omitted, display available scripts, otherwise
+PROGRAM is run with ARGS.
+"))
+
+(define (directory-files dir)
+  (if (and (file-exists? dir) (file-is-directory? dir))
+      (let ((dir-stream (opendir dir)))
+        (let loop ((new (readdir dir-stream))
+                   (acc '()))
+          (if (eof-object? new)
+              (begin
+                (closedir dir-stream)
+                acc)
+              (loop (readdir dir-stream)
+                    (if (or (string=? "."  new)             ; ignore
+                            (string=? ".." new))            ; ignore
+                        acc
+                        (cons new acc))))))
+      '()))
+
+(define (strip-extensions path)
+  (or-map (lambda (ext)
+            (and
+             (string-suffix? ext path)
+             (substring path 0
+                        (- (string-length path) (string-length ext)))))
+          (append %load-extensions %load-compiled-extensions)))
+
+(define (unique l)
+  (cond ((null? l) l)
+        ((null? (cdr l)) l)
+        ((equal? (car l) (cadr l)) (unique (cdr l)))
+        (else (cons (car l) (unique (cdr l))))))
+
+(define (find-submodules head)
+  (let ((shead (map symbol->string head)))
+    (unique
+     (sort
+      (append-map (lambda (path)
+                    (fold (lambda (x rest)
+                            (let ((stripped (strip-extensions x)))
+                              (if stripped (cons stripped rest) rest)))
+                          '()
+                          (directory-files
+                           (fold (lambda (x y) (in-vicinity y x)) path shead))))
+                  %load-path)
+      string<?))))
+
+(define (list-scripts)
+  (for-each (lambda (x)
+              ;; would be nice to show a summary.
+              (format #t "~A\n" x))
+            (find-submodules '(scripts))))
+
+(define (find-script s)
+  (let ((m (resolve-module (append '(scripts) (list (string->symbol s))))))
+    (and (module-public-interface m)
+         m)))
+
+(define (main args)
+  (if (or (equal? (cdr args) '())
+          (equal? (cdr args) '("list")))
+      (list-scripts)
+      (let ((mod (find-script (cadr args))))
+        (exit ((module-ref mod 'main) (cdr args))))))
diff --git a/meta/guile-tools.in b/meta/guile-tools.in
deleted file mode 100644
index 68db26887..000000000
--- a/meta/guile-tools.in
+++ /dev/null
@@ -1,118 +0,0 @@
-#!/bin/sh
-
-# 	Copyright (C) 2001, 2003, 2006, 2008 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this software; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301 USA
-
-# Usage: See `help' func below.
-#
-# 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
- --source            -- Display PROGRAM source (ignore ARGS) to stdout
-
-Default scripts dir: $default_scriptsdir
-EOF
-}
-
-prefix="@prefix@"
-datarootdir="@datarootdir@"
-pkgdatadir="@datadir@/@PACKAGE@"
-guileversion="@GUILE_EFFECTIVE_VERSION@"
-default_scriptsdir=$pkgdatadir/$guileversion/scripts
-
-top_srcdir="@top_srcdir_absolute@"
-top_builddir="@top_builddir_absolute@"
-
-# pre-install invocation frob
-mydir=$(cd $(dirname $0) && pwd)
-if [ "$mydir" = "$top_builddir/meta" ] ; then
-    default_scriptsdir=$top_srcdir/scripts
-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
-    exit 0
-    ;;
-x--help)
-    help
-    exit 0
-    ;;
-esac
-
-if [ x"$1" = x--scriptsdir ] ; then
-    user_scriptsdir=$2
-    shift
-    shift
-elif [ x"$1" = x--guileversion ] ; then
-    user_scriptsdir=$pkgdatadir/$2/scripts
-    shift
-    shift
-fi
-
-scriptsdir=${user_scriptsdir-$default_scriptsdir}
-
-if [ ! -d $scriptsdir ] ; then
-    echo $0: no such directory: $scriptsdir
-    exit 1
-fi
-
-if [ x"$1" = x -o x"$1" = xlist ] ; then
-    ls $scriptsdir
-    exit 0
-fi
-
-if [ x"$1" = x--source ] ; then
-    if [ x"$2" = x ] ; then echo $0: need to specify program ; exit 1 ; fi
-    if [ -x $scriptsdir/$2 ] ; then
-        cat $scriptsdir/$2
-        exit 0
-    else
-        echo $0: no such program: $2
-        exit 1
-    fi
-fi
-
-program=$scriptsdir/$1
-shift
-
-if [ -x $program ] ; then
-    exec $program "$@"
-else
-    echo $0: no such program: $program
-    exit 1
-fi
-
-# guile-tools ends here
diff --git a/module/Makefile.am b/module/Makefile.am
index 64a74482b..ee552762a 100644
--- a/module/Makefile.am
+++ b/module/Makefile.am
@@ -23,6 +23,8 @@
 # when building the rest.
 SUBDIRS = . ice-9 srfi oop
 
+include $(top_srcdir)/am/guilec
+
 # We're at the root of the module hierarchy.
 modpath =
 
@@ -44,7 +46,9 @@ SOURCES =								\
   $(SCHEME_LANG_SOURCES) $(ECMASCRIPT_LANG_SOURCES)			\
   $(GHIL_LANG_SOURCES) $(GLIL_LANG_SOURCES)				\
   $(ASSEMBLY_LANG_SOURCES) $(BYTECODE_LANG_SOURCES)			\
-  $(OBJCODE_LANG_SOURCES) $(VALUE_LANG_SOURCES)
+  $(OBJCODE_LANG_SOURCES) $(VALUE_LANG_SOURCES)				\
+									\
+  $(SCRIPTS_SOURCES)
 
 SCHEME_LANG_SOURCES =						\
   language/scheme/amatch.scm language/scheme/expand.scm 	\
@@ -84,7 +88,29 @@ ECMASCRIPT_LANG_SOURCES =			\
   language/ecmascript/array.scm			\
   language/ecmascript/compile-ghil.scm
 
+SCRIPTS_SOURCES =				\
+  scripts/PROGRAM.scm				\
+  scripts/autofrisk.scm				\
+  scripts/compile.scm				\
+  scripts/disassemble.scm			\
+  scripts/display-commentary.scm		\
+  scripts/doc-snarf.scm				\
+  scripts/frisk.scm				\
+  scripts/generate-autoload.scm			\
+  scripts/lint.scm				\
+  scripts/punify.scm				\
+  scripts/read-scheme-source.scm		\
+  scripts/read-text-outline.scm			\
+  scripts/use2dot.scm				\
+  scripts/snarf-check-and-output-texi.scm	\
+  scripts/summarize-guile-TODO.scm		\
+  scripts/scan-api.scm				\
+  scripts/api-diff.scm				\
+  scripts/read-rfc822.scm			\
+  scripts/snarf-guile-m4-docs.scm
+
+EXTRA_DIST += scripts/ChangeLog-2008
+EXTRA_DIST += scripts/README
+
 NOCOMP_SOURCES =				\
   system/repl/describe.scm
-
-include $(top_srcdir)/am/guilec
diff --git a/scripts/ChangeLog-2008 b/module/scripts/ChangeLog-2008
similarity index 100%
rename from scripts/ChangeLog-2008
rename to module/scripts/ChangeLog-2008
diff --git a/scripts/PROGRAM b/module/scripts/PROGRAM.scm
old mode 100755
new mode 100644
similarity index 82%
rename from scripts/PROGRAM
rename to module/scripts/PROGRAM.scm
index e83540851..af1a583bb
--- a/scripts/PROGRAM
+++ b/module/scripts/PROGRAM.scm
@@ -1,8 +1,3 @@
-#!/bin/sh
-# aside from this initial boilerplate, this is actually -*- scheme -*- code
-main='(module-ref (resolve-module '\''(scripts PROGRAM)) '\'main')'
-exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
-!#
 ;;; PROGRAM --- Does something
 
 ;; 	Copyright (C) 2002, 2006 Free Software Foundation, Inc.
diff --git a/scripts/README b/module/scripts/README
similarity index 100%
rename from scripts/README
rename to module/scripts/README
diff --git a/scripts/api-diff b/module/scripts/api-diff.scm
old mode 100755
new mode 100644
similarity index 97%
rename from scripts/api-diff
rename to module/scripts/api-diff.scm
index 0b41eeaaf..de750e14a
--- a/scripts/api-diff
+++ b/module/scripts/api-diff.scm
@@ -1,8 +1,3 @@
-#!/bin/sh
-# aside from this initial boilerplate, this is actually -*- scheme -*- code
-main='(module-ref (resolve-module '\''(scripts api-diff)) '\'main')'
-exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
-!#
 ;;; api-diff --- diff guile-api.alist files
 
 ;; 	Copyright (C) 2002, 2006 Free Software Foundation, Inc.
diff --git a/scripts/autofrisk b/module/scripts/autofrisk.scm
old mode 100755
new mode 100644
similarity index 97%
rename from scripts/autofrisk
rename to module/scripts/autofrisk.scm
index 154b635bb..e280be4d9
--- a/scripts/autofrisk
+++ b/module/scripts/autofrisk.scm
@@ -1,8 +1,3 @@
-#!/bin/sh
-# aside from this initial boilerplate, this is actually -*- scheme -*- code
-main='(module-ref (resolve-module '\''(scripts autofrisk)) '\'main')'
-exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
-!#
 ;;; autofrisk --- Generate module checks for use with auto* tools
 
 ;; 	Copyright (C) 2002, 2006 Free Software Foundation, Inc.
diff --git a/scripts/compile b/module/scripts/compile.scm
old mode 100755
new mode 100644
similarity index 98%
rename from scripts/compile
rename to module/scripts/compile.scm
index 41f542c1d..7c812ad1e
--- a/scripts/compile
+++ b/module/scripts/compile.scm
@@ -1,7 +1,3 @@
-#!/bin/sh
-# -*- scheme -*-
-exec ${GUILE-guile} -e '(@ (scripts compile) compile)' -s $0 "$@"
-!#
 ;;; Compile --- Command-line Guile Scheme compiler
 
 ;; Copyright 2005,2008,2009 Free Software Foundation, Inc.
@@ -135,6 +131,8 @@ Report bugs to <guile-user@gnu.org>.~%")
                                       #:opts compile-opts)))
               input-files)))
 
+(define main compile)
+
 ;;; Local Variables:
 ;;; coding: latin-1
 ;;; End:
diff --git a/scripts/disassemble b/module/scripts/disassemble.scm
old mode 100755
new mode 100644
similarity index 92%
rename from scripts/disassemble
rename to module/scripts/disassemble.scm
index 71ec05705..46ef0c744
--- a/scripts/disassemble
+++ b/module/scripts/disassemble.scm
@@ -1,7 +1,3 @@
-#!/bin/sh
-# -*- scheme -*-
-exec ${GUILE-guile} -e '(@ (scripts disassemble) disassemble)' -s $0 "$@"
-!#
 ;;; Disassemble --- Disassemble .go files into something human-readable
 
 ;; Copyright 2005,2008 Free Software Foundation, Inc.
@@ -39,3 +35,5 @@ exec ${GUILE-guile} -e '(@ (scripts disassemble) disassemble)' -s $0 "$@"
   (for-each (lambda (file)
               (disassemble (load-objcode file)))
             (cdr args)))
+
+(define main disassemble)
diff --git a/scripts/display-commentary b/module/scripts/display-commentary.scm
old mode 100755
new mode 100644
similarity index 90%
rename from scripts/display-commentary
rename to module/scripts/display-commentary.scm
index a12dae8c7..fd1ffd004
--- a/scripts/display-commentary
+++ b/module/scripts/display-commentary.scm
@@ -1,8 +1,3 @@
-#!/bin/sh
-# aside from this initial boilerplate, this is actually -*- scheme -*- code
-main='(module-ref (resolve-module '\''(scripts display-commentary)) '\'main')'
-exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
-!#
 ;;; display-commentary --- As advertized
 
 ;; 	Copyright (C) 2001, 2006 Free Software Foundation, Inc.
diff --git a/scripts/doc-snarf b/module/scripts/doc-snarf.scm
old mode 100755
new mode 100644
similarity index 98%
rename from scripts/doc-snarf
rename to module/scripts/doc-snarf.scm
index 4bc09f57c..4ceddc152
--- a/scripts/doc-snarf
+++ b/module/scripts/doc-snarf.scm
@@ -1,8 +1,3 @@
-#!/bin/sh
-# aside from this initial boilerplate, this is actually -*- scheme -*- code
-main='(module-ref (resolve-module '\''(scripts doc-snarf)) '\'main')'
-exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
-!#
 ;;; doc-snarf --- Extract documentation from source files
 
 ;; 	Copyright (C) 2001, 2006 Free Software Foundation, Inc.
diff --git a/scripts/frisk b/module/scripts/frisk.scm
old mode 100755
new mode 100644
similarity index 98%
rename from scripts/frisk
rename to module/scripts/frisk.scm
index 609a5e6a9..374bb4e3c
--- a/scripts/frisk
+++ b/module/scripts/frisk.scm
@@ -1,8 +1,3 @@
-#!/bin/sh
-# aside from this initial boilerplate, this is actually -*- scheme -*- code
-main='(module-ref (resolve-module '\''(scripts frisk)) '\'main')'
-exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
-!#
 ;;; frisk --- Grok the module interfaces of a body of files
 
 ;; 	Copyright (C) 2002, 2006 Free Software Foundation, Inc.
diff --git a/scripts/generate-autoload b/module/scripts/generate-autoload.scm
old mode 100755
new mode 100644
similarity index 96%
rename from scripts/generate-autoload
rename to module/scripts/generate-autoload.scm
index b08be8357..10f158c98
--- a/scripts/generate-autoload
+++ b/module/scripts/generate-autoload.scm
@@ -1,8 +1,3 @@
-#!/bin/sh
-# aside from this initial boilerplate, this is actually -*- scheme -*- code
-main='(module-ref (resolve-module '\''(scripts generate-autoload)) '\'main')'
-exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
-!#
 ;;; generate-autoload --- Display define-module form with autoload info
 
 ;; 	Copyright (C) 2001, 2006 Free Software Foundation, Inc.
diff --git a/scripts/lint b/module/scripts/lint.scm
old mode 100755
new mode 100644
similarity index 97%
rename from scripts/lint
rename to module/scripts/lint.scm
index 354420751..2ee9b7863
--- a/scripts/lint
+++ b/module/scripts/lint.scm
@@ -1,8 +1,3 @@
-#!/bin/sh
-# aside from this initial boilerplate, this is actually -*- scheme -*- code
-main='(module-ref (resolve-module '\''(scripts lint)) '\'main')'
-exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
-!#
 ;;; lint --- Preemptive checks for coding errors in Guile Scheme code
 
 ;; 	Copyright (C) 2002, 2006 Free Software Foundation, Inc.
diff --git a/scripts/punify b/module/scripts/punify.scm
old mode 100755
new mode 100644
similarity index 92%
rename from scripts/punify
rename to module/scripts/punify.scm
index 0f6a36114..098c4b935
--- a/scripts/punify
+++ b/module/scripts/punify.scm
@@ -1,8 +1,3 @@
-#!/bin/sh
-# aside from this initial boilerplate, this is actually -*- scheme -*- code
-main='(module-ref (resolve-module '\''(scripts punify)) '\'main')'
-exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
-!#
 ;;; punify --- Display Scheme code w/o unnecessary comments / whitespace
 
 ;; 	Copyright (C) 2001, 2006 Free Software Foundation, Inc.
diff --git a/scripts/read-rfc822 b/module/scripts/read-rfc822.scm
old mode 100755
new mode 100644
similarity index 95%
rename from scripts/read-rfc822
rename to module/scripts/read-rfc822.scm
index 0904d61d1..ed3aced7d
--- a/scripts/read-rfc822
+++ b/module/scripts/read-rfc822.scm
@@ -1,8 +1,3 @@
-#!/bin/sh
-# aside from this initial boilerplate, this is actually -*- scheme -*- code
-main='(module-ref (resolve-module '\''(scripts read-rfc822)) '\'main')'
-exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
-!#
 ;;; read-rfc822 --- Validate RFC822 file by displaying it to stdout
 
 ;; 	Copyright (C) 2002, 2004, 2006 Free Software Foundation, Inc.
diff --git a/scripts/read-scheme-source b/module/scripts/read-scheme-source.scm
old mode 100755
new mode 100644
similarity index 98%
rename from scripts/read-scheme-source
rename to module/scripts/read-scheme-source.scm
index 05bb1064c..c593d64e3
--- a/scripts/read-scheme-source
+++ b/module/scripts/read-scheme-source.scm
@@ -1,8 +1,3 @@
-#!/bin/sh
-# aside from this initial boilerplate, this is actually -*- scheme -*- code
-main='(module-ref (resolve-module '\''(scripts read-scheme-source)) '\'main')'
-exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
-!#
 ;;; read-scheme-source --- Read a file, recognizing scheme forms and comments
 
 ;; 	Copyright (C) 2001, 2006 Free Software Foundation, Inc.
diff --git a/scripts/read-text-outline b/module/scripts/read-text-outline.scm
old mode 100755
new mode 100644
similarity index 97%
rename from scripts/read-text-outline
rename to module/scripts/read-text-outline.scm
index c85026952..579fb6934
--- a/scripts/read-text-outline
+++ b/module/scripts/read-text-outline.scm
@@ -1,8 +1,3 @@
-#!/bin/sh
-# aside from this initial boilerplate, this is actually -*- scheme -*- code
-main='(module-ref (resolve-module '\''(scripts read-text-outline)) '\'main')'
-exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
-!#
 ;;; read-text-outline --- Read a text outline and display it as a sexp
 
 ;; 	Copyright (C) 2002, 2006 Free Software Foundation, Inc.
diff --git a/scripts/scan-api b/module/scripts/scan-api.scm
old mode 100755
new mode 100644
similarity index 97%
rename from scripts/scan-api
rename to module/scripts/scan-api.scm
index 3ea10dbe6..ceaac43d4
--- a/scripts/scan-api
+++ b/module/scripts/scan-api.scm
@@ -1,8 +1,3 @@
-#!/bin/sh
-# aside from this initial boilerplate, this is actually -*- scheme -*- code
-main='(module-ref (resolve-module '\''(scripts scan-api)) '\'main')'
-exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
-!#
 ;;; scan-api --- Scan and group interpreter and libguile interface elements
 
 ;; 	Copyright (C) 2002, 2006 Free Software Foundation, Inc.
diff --git a/scripts/snarf-check-and-output-texi b/module/scripts/snarf-check-and-output-texi.scm
old mode 100755
new mode 100644
similarity index 97%
rename from scripts/snarf-check-and-output-texi
rename to module/scripts/snarf-check-and-output-texi.scm
index ea33e1797..049d08411
--- a/scripts/snarf-check-and-output-texi
+++ b/module/scripts/snarf-check-and-output-texi.scm
@@ -1,8 +1,3 @@
-#!/bin/sh
-# aside from this initial boilerplate, this is actually -*- scheme -*- code
-main="(module-ref (resolve-module '(scripts snarf-check-and-output-texi)) 'main)"
-exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
-!#
 ;;; snarf-check-and-output-texi --- called by the doc snarfer.
 
 ;; 	Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc.
diff --git a/scripts/snarf-guile-m4-docs b/module/scripts/snarf-guile-m4-docs.scm
old mode 100755
new mode 100644
similarity index 92%
rename from scripts/snarf-guile-m4-docs
rename to module/scripts/snarf-guile-m4-docs.scm
index b80f187fe..11fb82b3d
--- a/scripts/snarf-guile-m4-docs
+++ b/module/scripts/snarf-guile-m4-docs.scm
@@ -1,8 +1,3 @@
-#!/bin/sh
-# aside from this initial boilerplate, this is actually -*- scheme -*- code
-main='(module-ref (resolve-module '\''(scripts snarf-guile-m4-docs)) '\'main')'
-exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
-!#
 ;;; snarf-guile-m4-docs --- Parse guile.m4 comments for texi documentation
 
 ;; 	Copyright (C) 2002, 2006 Free Software Foundation, Inc.
diff --git a/scripts/summarize-guile-TODO b/module/scripts/summarize-guile-TODO.scm
old mode 100755
new mode 100644
similarity index 97%
rename from scripts/summarize-guile-TODO
rename to module/scripts/summarize-guile-TODO.scm
index 79543fe27..bf4f14535
--- a/scripts/summarize-guile-TODO
+++ b/module/scripts/summarize-guile-TODO.scm
@@ -1,8 +1,3 @@
-#!/bin/sh
-# aside from this initial boilerplate, this is actually -*- scheme -*- code
-main='(module-ref (resolve-module '\''(scripts summarize-guile-TODO)) '\'main')'
-exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
-!#
 ;;; summarize-guile-TODO --- Display Guile TODO list in various ways
 
 ;; 	Copyright (C) 2002, 2006 Free Software Foundation, Inc.
diff --git a/scripts/use2dot b/module/scripts/use2dot.scm
old mode 100755
new mode 100644
similarity index 94%
rename from scripts/use2dot
rename to module/scripts/use2dot.scm
index 30b4690e0..bf1fdbddb
--- a/scripts/use2dot
+++ b/module/scripts/use2dot.scm
@@ -1,8 +1,3 @@
-#!/bin/sh
-# aside from this initial boilerplate, this is actually -*- scheme -*- code
-main='(module-ref (resolve-module '\''(scripts use2dot)) '\'main')'
-exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
-!#
 ;;; use2dot --- Display module dependencies as a DOT specification
 
 ;; 	Copyright (C) 2001, 2006 Free Software Foundation, Inc.
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
deleted file mode 100644
index ca96da78d..000000000
--- a/scripts/Makefile.am
+++ /dev/null
@@ -1,70 +0,0 @@
-## Process this file with automake to produce Makefile.in.
-##
-##  	Copyright (C) 2002, 2006, 2008 Free Software Foundation, Inc.
-##
-##   This file is part of GUILE.
-##
-##   GUILE is free software; you can redistribute it and/or modify
-##   it under the terms of the GNU General Public License as
-##   published by the Free Software Foundation; either version 2, or
-##   (at your option) any later version.
-##
-##   GUILE is distributed in the hope that it will be useful, but
-##   WITHOUT ANY WARRANTY; without even the implied warranty of
-##   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-##   GNU General Public License for more details.
-##
-##   You should have received a copy of the GNU General Public
-##   License along with GUILE; see the file COPYING.  If not, write
-##   to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
-##   Floor, Boston, MA 02110-1301 USA
-
-AUTOMAKE_OPTIONS = gnu
-
-# These should be installed and distributed.
-scripts_sources =				\
-	PROGRAM					\
-	autofrisk				\
-	compile					\
-	disassemble				\
-	display-commentary			\
-	doc-snarf				\
-	frisk					\
-	generate-autoload			\
-	lint					\
-	punify					\
-	read-scheme-source			\
-	read-text-outline			\
-	use2dot					\
-	snarf-check-and-output-texi		\
-	summarize-guile-TODO			\
-	scan-api				\
-	api-diff				\
-	read-rfc822				\
-	snarf-guile-m4-docs
-
-subpkgdatadir = $(pkgdatadir)/$(GUILE_EFFECTIVE_VERSION)/scripts
-subpkgdata_SCRIPTS = $(scripts_sources)
-
-EXTRA_DIST = $(scripts_sources) ChangeLog-2008
-
-list:
-	@echo $(scripts_sources)
-
-include $(top_srcdir)/am/pre-inst-guile
-
-overview: $(scripts_sources)
-	@echo '----------------------------'
-	@echo Overview
-	@echo I. Commentaries
-	@echo II. Module Interfaces
-	@echo '----------------------------'
-	@echo I. Commentaries
-	@echo '----------------------------'
-	$(preinstguiletool)/display-commentary $^
-	@echo '----------------------------'
-	@echo II. Module Interfaces
-	@echo '----------------------------'
-	$(preinstguiletool)/frisk $^
-
-# Makefile.am ends here
-- 
2.20.1