diff --git a/setup/wizard/lib/services/unixScheduler.php b/setup/wizard/lib/services/unixScheduler.php index deb5c80..a1235eb 100644 --- a/setup/wizard/lib/services/unixScheduler.php +++ b/setup/wizard/lib/services/unixScheduler.php @@ -179,7 +179,7 @@ class unixScheduler extends unixService { function start() { // TODO : Write sh on the fly? Not sure the reasoning here $source = $this->getSchedulerSourceLoc(); - $this->writeSchedulerTask(); +// $this->writeSchedulerTask(); $logFile = "/dev/null"; // @unlink($logFile); if($source) { // Source diff --git a/setup/wizard/steps/configuration.php b/setup/wizard/steps/configuration.php index bd64d0e..2a0ffc6 100644 --- a/setup/wizard/steps/configuration.php +++ b/setup/wizard/steps/configuration.php @@ -247,10 +247,12 @@ class configuration extends Step public function doRun($edit = false) { $server = $this->getServerInfo(); - if(!$edit) $this->temp_variables['server'] = $server; + if(!$edit || $this->util->isMigration()) + $this->temp_variables['server'] = $server; $paths = $this->getPathInfo($server['file_system_root']['value']); - if(!$edit) $this->temp_variables['paths'] = $paths; + if(!$edit || $this->util->isMigration()) + $this->temp_variables['paths'] = $paths; // Rewrite file system root if(!$this->fpath) { @@ -432,13 +434,15 @@ class configuration extends Step { if(isset($this->temp_variables['paths'])) { if ($this->util->isMigration()) { // Check if its an upgrade - $this->readInstallation(); // Read values from config.ini of other installation + $this->readConfigPath(); // Read contents of config-path file as only var Documents are used of old stack + $this->readInstallation(); // Read values from config.ini of other installation and overwrite config-path's $dirs = $this->getFromConfigPath(); // Store contents } else { $dirs = $this->temp_variables['paths']; // Pull from temp } } else { if ($this->util->isMigration()) { // Check if its an upgrade + $this->readConfigPath(); // Read contents of config-path file as only var Documents are used of old stack $this->readInstallation(); // Read values from config.ini of other installation } else { $this->readConfigPath(); // Read contents of config-path file @@ -455,13 +459,13 @@ class configuration extends Step } if(WINDOWS_OS) $path = preg_replace('/\//', '\\',$path); - $dirs[$key]['path'] = $path; - $path = $class = strtolower(substr($path,0,1)).substr($path,1); // Damn you windows - if(isset($dir['file'])) { - $class = $this->util->checkPermission($path, false, true); - } else { - $class = $this->util->checkPermission($path, $dir['create']); - } + $dirs[$key]['path'] = $path; + $path = $class = strtolower(substr($path,0,1)).substr($path,1); // Damn you windows + if(isset($dir['file'])) { + $class = $this->util->checkPermission($path, false, true); + } else { + $class = $this->util->checkPermission($path, $dir['create']); + } if(isset($class['msg'])) { if($class['class'] != 'tick') { $this->temp_variables['paths_perms'] = $class['class']; diff --git a/var/bin/schedulerTask.sh b/var/bin/schedulerTask.sh index 93ce1c8..4e7d69c 100755 --- a/var/bin/schedulerTask.sh +++ b/var/bin/schedulerTask.sh @@ -2,11 +2,11 @@ PHP_CLI="/usr/local/zend/bin/php" BIN_DIR=$(dirname $0) -INSTALL_DIR="../../${BIN_DIR}" +INSTALL_DIR="../..${BIN_DIR}" cd $INSTALL_DIR/bin while true; do $PHP_CLI -Cq scheduler.php sleep 30 -done \ No newline at end of file +done