[Chicken-hackers] [PATCH 2/2] Update makedist.scm and setversion for recent module changes

[Evan Hanson]

Add a missing import and fix a bug in makedist.scm (`read-lines` no
longer opens files), fix buildversion handling and the use of `system*`
in setversion (it no longer sprintfs).
---
 scripts/makedist.scm | 4 ++--
 scripts/setversion   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/makedist.scm b/scripts/makedist.scm
index 3cca17b2..01898ba8 100644
--- a/scripts/makedist.scm
+++ b/scripts/makedist.scm
@@ -1,7 +1,7 @@
 ;;;; makedist.scm - Make distribution tarballs
 
 
-(use data-structures extras files irregex posix setup-api (chicken process))
+(use data-structures files io irregex pathname posix setup-api (chicken 
process))
 
 (include "mini-srfi-1.scm")
 
@@ -44,7 +44,7 @@
    equal?) )
 
 (define (release full?)
-  (let* ((files (read-lines "distribution/manifest"))
+  (let* ((files (with-input-from-file "distribution/manifest" read-lines))
         (distname (conc "chicken-" BUILDVERSION)) 
         (distfiles (map (cut prefix distname <>) files)) 
         (tgz (conc distname ".tar.gz")))
diff --git a/scripts/setversion b/scripts/setversion
index 9da23b91..923f8a5e 100755
--- a/scripts/setversion
+++ b/scripts/setversion
@@ -5,7 +5,7 @@ exec csi -s "$0" "$@"
 
 (use data-structures files format io irregex (chicken process))
 
-(define buildversion (with-input-from-file "buildversion" read))
+(define buildversion (with-input-from-file "buildversion" read-line))
 
 (define files '("README" "manual/The User's Manual"))
 
@@ -28,7 +28,7 @@ exec csi -s "$0" "$@"
        (else
         (let ((tmp (create-temporary-file)))
           (patch (list which tmp) rx subst)
-          (system* "mv ~S ~S" tmp which) ) ) ) )
+          (system* (format "mv ~S ~S" tmp which))))))
 
 (define (parse-version v)
   (let ((m (irregex-match "(\\d+)\\.(\\d+)\\.(\\d+)(.*)" v)))
-- 
2.11.0