suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

setup/unixstyle-install: use delete-directory/files

Browse Source 
Use `delete-directory/files` instead of a separate implementation
here to get the special deletion mode for Windows files.
This commit is contained in:
Matthew Flatt 2018-06-16 08:51:52 -06:00
parent 5a4ea2cd1b
commit d3067465e3
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
racket/collects/setup/unixstyle-install.rkt
View File

@ -28,7 +28,8 @@
;; path names.
#lang racket/base
(require setup/cross-system)
(require setup/cross-system
racket/file)
(module test racket/base)
@ -125,11 +126,7 @@
;; removes a file or a directory (recursively)
(define (rm path)
(cond [(or (file-exists? path) (link-exists? path)) (delete-file path)]
[(directory-exists? path)
(parameterize ([current-directory path]) (for-each rm (ls)))
(delete-directory path)]
[else #t])) ; shouldn't happen
(delete-directory/files path))
;; removes "compiled" subdirectories recursively
(define (rm-compiled path)
@ -244,12 +241,12 @@
(regexp-match #rx#"^\317\372\355\376" magic))
(let ([temp (format "~a-temp-for-install"
(regexp-replace* #rx"/" file "_"))])
(with-handlers ([exn? (lambda (e) (delete-file temp) (raise e))])
(with-handlers ([exn? (lambda (e) (rm temp) (raise e))])
;; always copy so we never change the running executable
(rm temp)
(copy-file file temp)
(fix-binary temp)
(delete-file file)
(rm file)
(mv temp file)))]
[(regexp-match #rx#"^#!/bin/sh" magic)
(fix-script file)]
@ -322,7 +319,7 @@
(mv dst src)))]
[(rd) make-directory]
[(md) delete-directory]
[(file) delete-file]
[(file) rm]
[else (error 'undo-changes "internal-error: ~e" p)])
(cdr p)))
path-changes))