Merge pull request #88 from remicollet/issue-75852

Only add bin_dir to PATH if not already there
pear · Mar 13, 2019 · 63b7325 · 63b7325
2 parents 01a1050 + 203b4a3
commit 63b7325
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/PEAR/Builder.php b/PEAR/Builder.php
@@ -307,7 +307,9 @@ function build($descfile, $callback = null)
 
         $dir = getcwd();
         $this->log(2, "building in $dir");
-        putenv('PATH=' . $this->config->get('bin_dir') . ':' . getenv('PATH'));
+        if (!preg_match('@(^|:)' . $this->config->get('bin_dir') . '(:|$)@', getenv('PATH'))) {
+            putenv('PATH=' . $this->config->get('bin_dir') . ':' . getenv('PATH'));
+        }
         $err = $this->_runCommand($this->config->get('php_prefix')
                                 . "phpize" .
                                 $this->config->get('php_suffix'),