rename and use DELETE-REMOTE-TREE->DELETE-REMOTE-TREES

Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>

6 files changed, 7 insertions, 7 deletions

diff --git a/src/connection.lisp b/src/connection.lisp
index 83f60ba..3f5a4f6 100644
--- a/src/connection.lisp
+++ b/src/connection.lisp
@@ -375,7 +375,7 @@ start with RUN."
 (defun test (&rest args)
   (zerop (apply #'mrun :for-exit "test" args)))
 
-(defun delete-remote-tree (&rest paths)
+(defun delete-remote-trees (&rest paths)
   "Recursively delete each of PATHS."
   (mrun "rm" "-rf" paths))
 
diff --git a/src/connection/rehome.lisp b/src/connection/rehome.lisp
index ec943f1..77aaf6d 100644
--- a/src/connection/rehome.lisp
+++ b/src/connection/rehome.lisp
@@ -48,7 +48,7 @@
 (defmethod connection-clear-data-cache
     ((connection rehome-connection) iden1 iden2)
   (with-slots (datadir) connection
-    (mrun "rm" "-rf" (data-pathname (datadir connection) iden1 iden2))))
+    (delete-remote-trees (data-pathname (datadir connection) iden1 iden2))))
 
 (defmethod get-remote-cached-prerequisite-data
     ((connection rehome-connection))
diff --git a/src/data.lisp b/src/data.lisp
index 7772e33..640c057 100644
--- a/src/data.lisp
+++ b/src/data.lisp
@@ -295,7 +295,7 @@ new versions of data, to avoid them piling up."))
 (defmethod connection-clear-data-cache ((connection connection) iden1 iden2)
   (let* ((*connection* connection)
          (dir (ensure-directory-pathname (remote-data-pathname iden1 iden2))))
-    (mrun "rm" "-rf" dir)))
+    (delete-remote-trees dir)))
 
 (defun upload-all-prerequisite-data
     (&key (upload-string-data t) (connection *connection*))
diff --git a/src/package.lisp b/src/package.lisp
index e1de3fa..6044386 100644
--- a/src/package.lisp
+++ b/src/package.lisp
@@ -101,7 +101,7 @@
            #:runlines
            #:test
            #:remote-exists-p
-           #:delete-remote-tree
+           #:delete-remote-trees
            #:readfile
            #:writefile
            #:with-local-connection
diff --git a/src/property/chroot.lisp b/src/property/chroot.lisp
index c516c0d..e75b1e7 100644
--- a/src/property/chroot.lisp
+++ b/src/property/chroot.lisp
@@ -25,7 +25,7 @@
    ;; check whether a previous debootstrap failed partway through
    (if (test "-d" (merge-pathnames "debootstrap/"
                                    (ensure-directory-pathname root)))
-       (progn (mrun "rm" "-rf" root) nil)
+       (progn (delete-remote-trees root) nil)
        (test "-d" root)))
   (:apply
    (let* ((os (car (getf (hostattrs host) :os)))
diff --git a/src/property/git.lisp b/src/property/git.lisp
index 35f7005..76f5c32 100644
--- a/src/property/git.lisp
+++ b/src/property/git.lisp
@@ -37,11 +37,11 @@ available version of the snapshot is present on the remote system."
   (:check (and (not replace) (remote-exists-p dest)))
   (:apply
    (declare (ignore replace))
-   (delete-remote-tree dest)
+   (delete-remote-trees dest)
    (file:directory-exists directory)
    (with-remote-current-directory (directory)
      (mrun :input (get-data-stream "--git-snapshot" snapshot-name)
            "tar" "xfz" "-")))
   (:unapply
    (declare (ignore replace))
-   (delete-remote-tree dest)))
+   (delete-remote-trees dest)))