correctly referencing publicDir

Author: dmolsen

core/lib/PatternLab/FileUtil.php

@@ -24,7 +24,7 @@ class FileUtil {
 	*/
 	protected static function moveFile($s,$p) {
 		if (file_exists(Config::$options["sourceDir"]."/".$s)) {
-			copy(Config::$options["sourceDir"]."/".$s,__DIR__.Config::$options["patternPublicDir"]."/".$p);
+			copy(Config::$options["sourceDir"]."/".$s,Config::$options["publicDir"]."/".$p);
 		}
 	}
 

core/lib/PatternLab/Generator.php

@@ -114,18 +114,19 @@ public function generate($enableCSS = false, $moveStatic = true, $noCacheBuster
 
 				// clean-up the file name and make sure it's not one of the pattern lab files or to be ignored
 				$fileName = str_replace(Config::$options["sourceDir"].DIRECTORY_SEPARATOR,"",$name);
+				
 				if (($fileName[0] != "_") && (!in_array($object->getExtension(),Config::$options["ie"])) && (!in_array($object->getFilename(),Config::$options["id"]))) {
 
 					// catch directories that have the ignored dir in their path
 					$ignoreDir = FileUtil::ignoreDir($fileName);
 
 					// check to see if it's a new directory
-					if (!$ignoreDir && $object->isDir() && !is_dir(__DIR__.Config::$options["patternPublicDir"]."/".$fileName)) {
-						mkdir(__DIR__.Config::$options["patternPublicDir"]."/".$fileName);
+					if (!$ignoreDir && $object->isDir() && !is_dir(Config::$options["publicDir"]."/".$fileName)) {
+						mkdir(Config::$options["publicDir"]."/".$fileName);
 					}
 
 					// check to see if it's a new file or a file that has changed
-					if (!$ignoreDir && $object->isFile() && (!file_exists(__DIR__.Config::$options["patternPublicDir"]."/".$fileName))) {
+					if (!$ignoreDir && $object->isFile() && (!file_exists(Config::$options["publicDir"]."/".$fileName))) {
 						FileUtil::moveStaticFile($fileName);
 					}
 

core/lib/PatternLab/Watcher.php

@@ -185,8 +185,8 @@ public function watch($reload = false, $moveStatic = true, $noCacheBuster = fals
 						$ignoreDir = $this->ignoreDir($fileName);
 
 						// check to see if it's a new directory
-						if (!$ignoreDir && $object->isDir() && !isset($o->$fileName) && !is_dir(Config::$options["patternPublicDir"]."/".$fileName)) {
-							mkdir(Config::$options["patternPublicDir"]."/".$fileName);
+						if (!$ignoreDir && $object->isDir() && !isset($o->$fileName) && !is_dir(Config::$options["publicDir"]."/".$fileName)) {
+							mkdir(Config::$options["publicDir"]."/".$fileName);
 							$o->$fileName = "dir created"; // placeholder
 							print $fileName."/ directory was created...\n";
 						}
@@ -195,7 +195,7 @@ public function watch($reload = false, $moveStatic = true, $noCacheBuster = fals
 						if (file_exists($name)) {
 
 							$mt = $object->getMTime();
-							if (!$ignoreDir && $object->isFile() && !isset($o->$fileName) && !file_exists(Config::$options["patternPublicDir"]."/".$fileName)) {
+							if (!$ignoreDir && $object->isFile() && !isset($o->$fileName) && !file_exists(Config::$options["publicDir"]."/".$fileName)) {
 								$o->$fileName = $mt;
 								FileUtil::moveStaticFile($fileName,"added");
 								if ($object->getExtension() == "css") {
@@ -225,9 +225,6 @@ public function watch($reload = false, $moveStatic = true, $noCacheBuster = fals
 			$c = true;
 
 			// taking out the garbage. basically killing mustache after each run.
-			unset($this->pl);
-			unset($this->msf);
-			unset($this->mv);
 			if (gc_enabled()) gc_collect_cycles();
 
 			// output anything the reload server might send our way