projects
/
pharext
/
pharext
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
correctly bail out on non-existing INI file
[pharext/pharext]
/
src
/
pharext
/
Task
/
Activate.php
diff --git
a/src/pharext/Task/Activate.php
b/src/pharext/Task/Activate.php
index 1bbd9a86fc6200a00bd6ac8c2e7fcc542b4049ca..6a892e89741af32edcaa38077f6e1dfe6327d6b2 100644
(file)
--- a/
src/pharext/Task/Activate.php
+++ b/
src/pharext/Task/Activate.php
@@
-65,6
+65,9
@@
class Activate implements Task
* @return boolean false, if extension was already activated
*/
public function run($verbose = false) {
* @return boolean false, if extension was already activated
*/
public function run($verbose = false) {
+ if ($verbose !== false) {
+ printf("Running INI activation ...\n");
+ }
$extension = basename(current(glob("{$this->cwd}/modules/*.so")));
if ($this->type === "zend_extension") {
$extension = basename(current(glob("{$this->cwd}/modules/*.so")));
if ($this->type === "zend_extension") {
@@
-74,6
+77,12
@@
class Activate implements Task
}
foreach ($this->inis as $file) {
}
foreach ($this->inis as $file) {
+ if ($verbose) {
+ printf("Checking %s ...\n", $file);
+ }
+ if (!file_exists($file)) {
+ throw new Exception(sprintf("INI file '%s' does not exist", $file));
+ }
$temp = new Tempfile("phpini");
foreach (file($file) as $line) {
if (preg_match("/^\s*{$this->type}\s*=\s*[\"']?{$pattern}[\"']?\s*(;.*)?\$/", $line)) {
$temp = new Tempfile("phpini");
foreach (file($file) as $line) {
if (preg_match("/^\s*{$this->type}\s*=\s*[\"']?{$pattern}[\"']?\s*(;.*)?\$/", $line)) {
@@
-84,6
+93,9
@@
class Activate implements Task
}
/* not found; append to last processed file, which is the main by default */
}
/* not found; append to last processed file, which is the main by default */
+ if ($verbose) {
+ printf("Activating in %s ...\n", $file);
+ }
fprintf($temp->getStream(), $this->type . "=%s\n", $extension);
$temp->closeStream();
fprintf($temp->getStream(), $this->type . "=%s\n", $extension);
$temp->closeStream();
@@
-112,6
+124,10
@@
class Activate implements Task
$cmd->setSu($this->sudo);
}
$cmd->run([$path, $file]);
$cmd->setSu($this->sudo);
}
$cmd->run([$path, $file]);
+
+ if ($verbose) {
+ printf("Replaced %s ...\n", $file);
+ }
return true;
}
return true;
}