fix reloadpsl

geekwright · geekwright · commit 0e0c8e384d45 · 2017-02-08T07:41:43.000-06:00
diff --git a/bin/reloadpsl b/bin/reloadpsl
@@ -14,7 +14,7 @@ function includeIfExists($file)
     }
 }
 
-if ((!$loader = includeIfExists(__DIR__.'/../vendor/autoload.php'))
+if ((!$loader = includeIfExists(__DIR__.'/../autoload.php'))
     && (!$loader = includeIfExists(__DIR__.'/../../../autoload.php')))
 {
     die("You must set up the project dependencies, run composer install\n");
diff --git a/src/PublicSuffixList.php b/src/PublicSuffixList.php
@@ -281,7 +281,7 @@ protected function setLocalPSLName($url)
      */
     public function clearDataDirectory($cacheOnly = false)
     {
-        $dir = $this->dataDir;
+        $dir = __DIR__ . $this->dataDir;
         if (is_dir($dir)) {
             if ($dirHandle = opendir($dir)) {
                 while (($file = readdir($dirHandle)) !== false) {

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ function includeIfExists($file)`
`14`	`14`	`}`
`15`	`15`	`}`
`16`	`16`
`17`		`-if ((!$loader = includeIfExists(__DIR__.'/../vendor/autoload.php'))`
	`17`	`+if ((!$loader = includeIfExists(__DIR__.'/../autoload.php'))`
`18`	`18`	`&& (!$loader = includeIfExists(__DIR__.'/../../../autoload.php')))`
`19`	`19`	`{`
`20`	`20`	`die("You must set up the project dependencies, run composer install\n");`
Original file line number	Diff line number	Diff line change
`@@ -281,7 +281,7 @@ protected function setLocalPSLName($url)`
`281`	`281`	`*/`
`282`	`282`	`public function clearDataDirectory($cacheOnly = false)`
`283`	`283`	`{`
`284`		`- $dir = $this->dataDir;`
	`284`	`+ $dir = __DIR__ . $this->dataDir;`
`285`	`285`	`if (is_dir($dir)) {`
`286`	`286`	`if ($dirHandle = opendir($dir)) {`
`287`	`287`	`while (($file = readdir($dirHandle)) !== false) {`