~ chicken-core (chicken-5) 2abae62eba2faa82d7a0380504ed5f6746268830

commit 2abae62eba2faa82d7a0380504ed5f6746268830
Author:     Evan Hanson <evhan@foldling.org>
AuthorDate: Sat Apr 18 10:07:54 2015 +1200
Commit:     Evan Hanson <evhan@foldling.org>
CommitDate: Sat Apr 18 10:07:54 2015 +1200

    Remove srfi-1 usage from files under scripts/

diff --git a/scripts/makedist.scm b/scripts/makedist.scm
index 63dfcdf3..f5eb819c 100644
--- a/scripts/makedist.scm
+++ b/scripts/makedist.scm
@@ -1,7 +1,9 @@
 ;;;; makedist.scm - Make distribution tarballs
 
 
-(use irregex srfi-1 setup-api)
+(use irregex setup-api)
+
+(include "mini-srfi-1.scm")
 
 (define *release* #f)
 (define *help* #f)
diff --git a/scripts/mini-salmonella.scm b/scripts/mini-salmonella.scm
index 6257a7e9..3ebff2b0 100644
--- a/scripts/mini-salmonella.scm
+++ b/scripts/mini-salmonella.scm
@@ -4,7 +4,7 @@
 (module mini-salmonella ()
 
 (import scheme chicken)
-(use posix files extras data-structures srfi-1 setup-api utils)
+(use posix files extras data-structures setup-api utils)
 
 (define (usage code)
   (print "usage: mini-salmonella [-h] [-test] [-debug] [-download] [-trunk] EGGDIR [PREFIX]")
@@ -41,10 +41,12 @@
   (for-each 
    (lambda (f)
      (let ((f2 (make-pathname *repository* f)))
-       (if (directory? f2)
-	   (remove-directory f2)
-	   (delete-file f2))))
-   (lset-difference string=? (directory *repository*) *snapshot*)))
+       (cond ((member f2 *snapshot*))
+             ((directory? f2)
+              (remove-directory f2))
+             (else
+              (delete-file f2)))))
+   (directory *repository*)))
 
 (define *chicken-install*
   (normalize-pathname (make-pathname *prefix* "bin/chicken-install")))
@@ -60,7 +62,7 @@
 	   (let ((tags (sort (directory tagsdir) version>=?)))
 	     (if (null? tags)
 		 (or trunkdir ed)
-		 (make-pathname ed (string-append "tags/" (first tags))))))
+		 (make-pathname ed (string-append "tags/" (car tags))))))
 	  (else (or trunkdir ed)))))
 
 (define (report egg msg . args)
diff --git a/scripts/reconstruct-egg-name.scm b/scripts/reconstruct-egg-name.scm
index 89dd7bd1..c93e4309 100644
--- a/scripts/reconstruct-egg-name.scm
+++ b/scripts/reconstruct-egg-name.scm
@@ -4,7 +4,7 @@
 ; (minimally modified by felix)
 
 
-(use extras files posix srfi-1 miscmacros)
+(use extras files posix miscmacros)
 
 ;; Write the elements of the list `ls' to the output-port or output-file,
 ;; using
@@ -69,7 +69,10 @@
     (newline)
     (let* ((egdrnms (directory eggdir))
            (siflnms (info-filenames repdir))
-           (eggnams (lset-intersection string=? egdrnms siflnms)) )
+           (eggnams (foldl (lambda (a e)
+                             (if (member e siflnms) (cons e a) a))
+                           '()
+                           egdrnms)))
     (for-each
       (lambda (eggnam)
         (print eggnam)