Merge branch 'master' into jsdom

mikedeboer · Jun 1, 2012 · c0bd7a8 · c0bd7a8
2 parents 868dbef + fc9a5ab
commit c0bd7a8
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/lib/DAV/plugins/filelist.js b/lib/DAV/plugins/filelist.js
@@ -14,6 +14,7 @@ var jsDAV_Codesearch_Plugin = require("./codesearch");
 var Spawn = require("child_process").spawn;
 var Util  = require("./../util");
 var GnuTools = require("gnu-tools");
+var platform = require("os").platform();
 
 function jsDAV_Filelist_Plugin(handler) {
     this.handler = handler;
@@ -81,9 +82,13 @@ jsDAV_Filelist_Plugin.FIND_CMD = GnuTools.FIND_CMD;
             "\\.git", "\\.hg", "\\.pc", "\\.svn", "blib", 
             "CVS", "RCS", "SCCS", "\.DS_Store"
         ];
-
+
+
         var args = ["-L", ".", "-type", "f", "-a"];
 
+        if (platform === "darwin")
+            args.unshift("-E");
+
         //Hidden Files
         if (options.showHiddenFiles == "1")
             args.push("!", "-regex", "\\/\\.[^\\/]*$");
@@ -96,7 +101,8 @@ jsDAV_Filelist_Plugin.FIND_CMD = GnuTools.FIND_CMD;
             args.push("!", "-regex", ".*\\/" + pattern + "\\/.*");
         });
 
-        args.push("-regextype", "posix-extended", "-print");
+        if (platform !== "darwin")
+            args.push("-regextype", "posix-extended", "-print"); 
 
         if (jsDAV.debugMode)
             Util.log("search command: " + jsDAV_Filelist_Plugin.FIND_CMD + args.join(" "));