CONNECTION-WRITEFILE: deal in modes rather than umasks

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

1 files changed, 12 insertions, 9 deletions

diff --git a/src/connection/shell-wrap.lisp b/src/connection/shell-wrap.lisp
index 99d1735..345a59d 100644
--- a/src/connection/shell-wrap.lisp
+++ b/src/connection/shell-wrap.lisp
@@ -33,16 +33,19 @@
 
 (defmethod connection-writefile ((conn shell-wrap-connection)
 				 path
-				 contents
-				 umask)
-  ;; TODO do we want a CONNECTION-ERROR condition?
-  (with-remote-temporary-file (temp :connection conn)
+				 content
+				 mode)
+  (with-remote-temporary-file
+      (temp :connection conn :directory (pathname-directory-pathname path))
+    ;; TODO do we want a CONNECTION-ERROR condition to tidy this up?
     (multiple-value-bind (out exit)
-	(connection-run conn (if umask
-				 (format nil "( umask ~O; cat >~A )"
-					 umask temp)
-				 #?"cat >${temp}")
-			contents)
+	(connection-run conn
+			(format nil "chmod ~O ~A" mode
+				(escape-sh-token temp))
+			nil)
+      (unless (zerop exit) (error "Failed to chmod ~A: ~A" temp out)))
+    (multiple-value-bind (out exit)
+	(connection-run conn #?"cat >${temp}" content)
       (unless (zerop exit) (error "Failed to write ~A: ~A" temp out)))
     (multiple-value-bind (out exit)
 	(connection-run