From 0ead209cc5e2dfb230878438cd7befd00881e3d0 Mon Sep 17 00:00:00 2001
From: Philip McGrath <philip@philipmcgrath.com>
Date: Sat, 13 Mar 2021 11:59:32 -0500
Subject: [PATCH] Chez Scheme: further adjust paths for utils in build scripts

As suggested by @akeep

Co-authored-by: Andy Keep <akeep@robotman.org>
---
 racket/src/ChezScheme/mats/6.ms    |  2 +-
 racket/src/ChezScheme/mats/unix.ms |  4 ++--
 racket/src/ChezScheme/newrelease   | 10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/racket/src/ChezScheme/mats/6.ms b/racket/src/ChezScheme/mats/6.ms
index 3909d2bd9b..a1584eb239 100644
--- a/racket/src/ChezScheme/mats/6.ms
+++ b/racket/src/ChezScheme/mats/6.ms
@@ -2756,7 +2756,7 @@
       (begin
         (system "ln -s ../examples .")
         (load "examples/fatfib.ss" compile)
-        (system "rm examples")
+        (system "rm -f examples")
         #t))
   (or (windows?) (embedded?)
       (equal?
diff --git a/racket/src/ChezScheme/mats/unix.ms b/racket/src/ChezScheme/mats/unix.ms
index 23169895ef..db7f6f9378 100644
--- a/racket/src/ChezScheme/mats/unix.ms
+++ b/racket/src/ChezScheme/mats/unix.ms
@@ -72,8 +72,8 @@
   (mat system
     (eqv? (with-output-to-file "testfile.ss" void '(replace)) (void))
     (begin
-      (system (format "~:[~;/pkg~]rm testfile.ss" (embedded?)))
-      (system (format "~:[~;/pkg~]echo hello > testfile.ss" (embedded?)))
+      (system "rm -f testfile.ss")
+      (system "echo hello > testfile.ss")
       (let ([p (open-input-file "testfile.ss")])
         (and (eq? (read p) 'hello)
              (begin (close-input-port p) #t))))
diff --git a/racket/src/ChezScheme/newrelease b/racket/src/ChezScheme/newrelease
index 8005f1eeda..b13b067b59 100755
--- a/racket/src/ChezScheme/newrelease
+++ b/racket/src/ChezScheme/newrelease
@@ -92,7 +92,7 @@ sed -e "s/csv[0-9]\.[0-9]\(\.[0-9]\)*/csv$R/" ../makefiles/Mf-install.in > makef
 sed -e "s/csug[0-9]\.[0-9]/csug$MR.$mR/" -e "s/csug[0-9]_[0-9]/csug$MR""_$mR/" ../makefiles/Makefile-csug.in > makefiles/Makefile-csug.in
 set maybeupdatedfiles = ($maybeupdatedfiles makefiles/Mf-install.in makefiles/Makefile-csug.in)
 
-rm scheme.1.in
+rm -f scheme.1.in
 sed -e "s/Chez Scheme Version [0-9]\.[0-9]\(\.[0-9]\)* .* [0-9][0-9]*/Chez Scheme Version $R `date +'%B %Y'`/" \
     -e "s/Copyright .* Cisco Systems, Inc./Copyright `date +%Y` Cisco Systems, Inc./" \
   ../scheme.1.in > scheme.1.in
@@ -145,17 +145,17 @@ sed -e "s/Revised\(.*\)for Chez Scheme Version [^ ]*<br>/Revised\1for Chez Schem
   ../csug/csug.stex > csug/csug.stex
 set maybeupdatedfiles = ($maybeupdatedfiles csug/copyright.stex csug/csug.stex)
 
-rm bintar/Makefile
+rm -f bintar/Makefile
 sed -e "s/^version = .*/version = $R/" \
     -e "s/csv[0-9][0-9][0-9]*/csv$ZR/g" \
   ../bintar/Makefile > bintar/Makefile
 set maybeupdatedfiles = ($maybeupdatedfiles bintar/Makefile)
 
-rm rpm/Makefile
+rm -f rpm/Makefile
 sed -e "s/^version = .*/version = $R/" ../rpm/Makefile > rpm/Makefile
 set maybeupdatedfiles = ($maybeupdatedfiles rpm/Makefile)
 
-rm pkg/Makefile
+rm -f pkg/Makefile
 sed -e "s/^version = .*/version = $R/" \
     -e "s/&copy; .* Cisco Systems/\&copy; `date +%Y` Cisco Systems/" \
      ../pkg/Makefile > pkg/Makefile
@@ -174,7 +174,7 @@ foreach x ($maybeupdatedfiles)
   cmp -s ../$x $x || set updatedfiles = ($updatedfiles $x)
 end
 
-rm LOG
+rm -f LOG
 cat ../LOG > LOG
 echo "" >> LOG
 echo "$R changes:" >> LOG