DS_Store is a file, not a directory

edgecase · May 4, 2013 · efad6ca · efad6ca
1 parent 81d7cd9
commit efad6ca
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 4 deletions.
diff --git a/dieter-core/src/dieter/asset/manifest.clj b/dieter-core/src/dieter/asset/manifest.clj
@@ -24,8 +24,8 @@ namely a vector or list of file names or directory paths."
                 (file-seq file))))
        flatten
        (remove #(or (re-matches #".*\.swp$" (.getCanonicalPath %)) ; vim swap files
-                    (re-matches #"/.*\.#.*$" (.getCanonicalPath %)) ; emacs swap files
-                    (re-matches #".*/\.DS_Store/.*" (.getCanonicalPath %)) ; OSX
+                    (re-matches #".*/\.#[^\/]+$" (.getCanonicalPath %)) ; emacs swap files
+                    (re-matches #".*/\.DS_Store$" (.getCanonicalPath %)) ; OSX
                     (.isDirectory %)))))
 
 (defn compile-manifest [file]

diff --git a/...re_test/nested/.DS_Store/nested/some_file → ...javascripts/dsstore_test/nested/.DS_Store b/...re_test/nested/.DS_Store/nested/some_file → ...javascripts/dsstore_test/nested/.DS_Store
diff --git a/...e/test/fixtures/assets/javascripts/dsstore_test/nested/.DS_Store/nested/.#testfile.coffee b/...e/test/fixtures/assets/javascripts/dsstore_test/nested/.DS_Store/nested/.#testfile.coffee
diff --git a/dieter-core/test/fixtures/assets/javascripts/dsstore_test/nested/.DS_Store/some_file b/dieter-core/test/fixtures/assets/javascripts/dsstore_test/nested/.DS_Store/some_file