Merge branch 'master' of github.com:boot-clj/boot

boot-clj · Jun 20, 2018 · 246cab5 · 246cab5
2 parents 8f3e56b + 37fa9fb
commit 246cab5
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/boot/core/src/boot/task_helpers.clj b/boot/core/src/boot/task_helpers.clj
@@ -117,12 +117,14 @@
 (defmethod sift-action :move
   [_ _ args]
   (let [proc    #(reduce-kv string/replace % args)
-        reducer (fn [xs k v]
-                  (let [k (proc k)]
-                    (assoc xs k (assoc v :path k))))]
+        mkreducer (fn [dir]
+                    (fn [xs k v]
+                      (let [k (proc k)]
+                        (assoc xs k (assoc v :path k :dir dir)))))]
     (fn [fileset]
-      (->> (partial reduce-kv reducer {})
-           (update-in fileset [:tree])))))
+      (let [dir (#'core/get-add-dir fileset #{:resource})]
+        (->> (partial reduce-kv (mkreducer dir) {})
+             (update-in fileset [:tree]))))))
 
 (defmethod sift-action :add-jar
   [v? _ args]