Added support for windows systems

dansimpson · Jun 23, 2011 · bbc3158 · bbc3158
1 parent 11531f2
commit bbc3158
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/core/src/main/scala/org/ds/satchel/Satchel.scala b/core/src/main/scala/org/ds/satchel/Satchel.scala
@@ -267,13 +267,12 @@ class Satchel(val name: String,
    * Strip the root from the file path
    */
   private def filename(path: String): String = {
-    path.replaceFirst(root, "")
+    path.replace('\\','/').replaceFirst(root, "")
   }
 
   private def glob(patterns: List[String]): List[String] = {
     patterns.map { pattern: String =>
       FileUtil.eglob(root + "/" + pattern)
-      //util.eglob(root + "/" + pattern)
     }.flatten.removeDuplicates
   }
 

diff --git a/core/src/main/scala/org/ds/satchel/processors/JstProcessor.scala b/core/src/main/scala/org/ds/satchel/processors/JstProcessor.scala
@@ -33,7 +33,7 @@ class JstProcessor extends SatchelProcessor {
   	}
 
   	override def process(path:String, content:String):String = {
-  	  "JST[\"" + path + "\"] = \"" + clean(content) + "\";";
+  	  "JST[\"" + path.replace('\\','/') + "\"] = \"" + clean(content) + "\";";
   	}
 
   	private def clean(content:String) = {

diff --git a/core/src/main/scala/org/ds/satchel/util/FileUtil.scala b/core/src/main/scala/org/ds/satchel/util/FileUtil.scala
@@ -35,7 +35,7 @@ object FileUtil {
     val result = new RichFile(new File(root)).tree.map(_.toString)
 
     result.filter { p =>
-      val itr = regex.findAllIn(p)
+      val itr = regex.findAllIn(p.replace('\\','/'))
       itr.size > 0
     }.toList.reverse
   }