>From 3f2b228c25cef1f75821ae2c68c3daa67a72f1ff Mon Sep 17 00:00:00 2001 From: Evan Hanson Date: Thu, 5 Jul 2018 20:48:56 +1200 Subject: [PATCH] Remove directories when uninstalling extensions --- chicken-uninstall.scm | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/chicken-uninstall.scm b/chicken-uninstall.scm index 6a692c83..148bc880 100644 --- a/chicken-uninstall.scm +++ b/chicken-uninstall.scm @@ -111,20 +111,17 @@ files) (delete-installed-file ifile))) -(define (delete-file-command platform) - (case platform - ((unix) "rm -f ") - ((windows) "del /q /s "))) - (define (delete-installed-file fname) (cond ((not (file-exists? fname)) (warning "file does not exist" fname)) ((and sudo-uninstall (eq? 'unix default-platform)) - (let ((r (system (string-append "sudo " (delete-file-command 'unix) - "\"" fname "\"")))) + (let ((r (system (string-append "sudo rm -f -r " (qs fname))))) (unless (zero? r) (warning "deleting file failed" fname)))) - (else (delete-file fname)))) + ((directory-exists? fname) + (delete-directory fname #t)) + (else + (delete-file fname)))) (define (uninstall pats mtch) (let ((eggs (gather-eggs pats mtch))) -- 2.11.0