Fix xcopy invocation in sh/copy

spork/sh.janet

@@ -159,11 +159,11 @@
   (if (= :windows (os/which))
     (let [end (last (path/posix/parts src))
           isdir (= (os/stat src :mode) :directory)]
-      (os/shell (string "C:\\Windows\\System32\\xcopy.exe"
-                        " "
-                        (path/win32/join ;(path/posix/parts src))
-                        (path/win32/join ;(if isdir [;(path/posix/parts dest) end] (path/posix/parts dest)))
-                        "/y /s /e /i > nul")))
+      (os/shell (string/join
+                  ["C:\\Windows\\System32\\xcopy.exe"
+                   (path/win32/join ;(path/posix/parts src))
+                   (path/win32/join ;(if isdir [;(path/posix/parts dest) end] (path/posix/parts dest)))
+                   "/y /s /e /i /-i > nul"] " ")))
     (os/execute ["cp" "-rf" src dest] :px)))
 
 (def- shlex-grammar (peg/compile ~{:ws (set " \t\r\n")

test/suite-sh.janet

@@ -5,9 +5,10 @@
 (start-suite)
 
 (def base-path "test")
+(def assets-dir ["assets" "17"])
 
 (do
-  (assert (deep= (os/dir (path/join base-path "assets/17"))
+  (assert (deep= (os/dir (path/join base-path ;assets-dir))
                  @["test.file"])
           "test files are wrong, assets/17 should only contain test.file")
   (sh/copy-file (path/join base-path "assets/17/test.file")
@@ -35,8 +36,17 @@
              nil)
           "sh/rm didn't work correctly"))
 
-(assert (deep= 
+(assert (deep=
           (sh/split ` "c d \" f" ' y z'  a b a\ b --cflags `)
           @["c d \" f" " y z" "a" "b" "a b" "--cflags"]))
 
+(def new-dir ["assets" "18"])
+(sh/create-dirs (path/join base-path ;new-dir))
+(defer (do
+         (os/rm (path/join base-path ;new-dir "test.file"))
+         (os/rmdir (path/join base-path ;new-dir)))
+  (sh/copy (path/join base-path ;assets-dir "test.file")
+           (path/join base-path ;new-dir))
+  (assert (= :file (os/stat (path/join base-path ;new-dir "test.file") :mode))))
+
 (end-suite)