From 111ecc5689e7d0e98a0b6ae0866cc89df654eb4f Mon Sep 17 00:00:00 2001 From: Jarrett Jordaan Date: Wed, 4 Nov 2009 10:00:12 +0200 Subject: [PATCH] Lock Files moved to central location, Service validation removed, Service auto start removed --- dmsctl.sh | 330 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ setup/migrate/steps/migrateDatabase.php | 2 +- setup/upgrade/upgrade.lock | 0 setup/upgrade/upgradeUtil.php | 4 ++-- setup/upgrade/upgradeWizard.php | 4 ++-- setup/wizard/iniUtilities.php | 11 +++++------ setup/wizard/installUtil.php | 14 +++++++------- setup/wizard/installWizard.php | 6 +++--- setup/wizard/installer.php | 2 +- setup/wizard/lib/services/unixLucene.php | 5 +++-- setup/wizard/lib/services/unixOpenOffice.php | 3 ++- setup/wizard/lib/services/unixScheduler.php | 6 +++--- setup/wizard/lib/services/windowsScheduler.php | 6 +++--- setup/wizard/lib/validation/luceneValidation.php | 13 +++++++++---- setup/wizard/steps/configuration.php | 8 ++++---- setup/wizard/steps/database.php | 16 +++++++++------- setup/wizard/steps/dependencies.php | 2 +- setup/wizard/steps/registration.php | 4 ++-- setup/wizard/steps/services.php | 24 +++++++++++++++++++++++- setup/wizard/templates/installtype.tpl | 4 ++-- setup/wizard/templates/services.tpl | 62 ++++++++++++++++++++++++++++++++------------------------------ 21 files changed, 444 insertions(+), 82 deletions(-) create mode 100755 dmsctl.sh delete mode 100644 setup/upgrade/upgrade.lock diff --git a/dmsctl.sh b/dmsctl.sh new file mode 100755 index 0000000..ada34fb --- /dev/null +++ b/dmsctl.sh @@ -0,0 +1,330 @@ +#!/bin/sh + +# Boot KnowledgeTree services +# chkconfig: 2345 55 25 +# description: KnowledgeTree Services +# +# processname: ktdms + +HOSTNAME=`hostname` +RETVAL=0 +PID="" +ERROR=0 +SERVER=all +VDISPLAY="99" +INSTALL_PATH=`pwd` +JAVABIN=/usr/bin/java +ZEND_DIR=/usr/local/zend + +# OpenOffice +SOFFICEFILE=soffice +SOFFICE_PIDFILE=$INSTALL_PATH/var/log/soffice.bin.pid +SOFFICE_PID="" +SOFFICE_PORT="8100" +SOFFICEBIN=/usr/bin/soffice +SOFFICE="$SOFFICEBIN -nofirststartwizard -nologo -headless -accept=socket,host=127.0.0.1,port=$SOFFICE_PORT;urp;StarOffice.ServiceManager" +SOFFICE_STATUS="" + +# Lucene +LUCENE_PIDFILE=$INSTALL_PATH/var/log/lucene.pid +LUCENE_PID="" +LUCENE="$JAVABIN -Xms512M -Xmx512M -jar ktlucene.jar" +LUCENE_STATUS="" + +# Scheduler +SCHEDULER_PATH="$INSTALL_PATH/bin/" +SCHEDULER_PIDFILE=$INSTALL_PATH/var/log/scheduler.pid +SCHEDULER_PID="" +SCHEDULERBIN="$INSTALL_PATH/var/bin/schedulerTask.sh" +SCHEDULER="$SCHEDULERBIN" +SCHEDULER_STATUS="" + +get_pid() { + PID="" + PIDFILE=$1 + # check for pidfile + if [ -f $PIDFILE ] ; then + exec 6<&0 + exec < $PIDFILE + read pid + PID=$pid + exec 0<&6 6<&- + fi +} + +get_soffice_pid() { + get_pid $SOFFICE_PIDFILE + if [ ! $PID ]; then + return + fi + if [ $PID -gt 0 ]; then + SOFFICE_PID=$PID + fi +} + +get_lucene_pid() { + get_pid $LUCENE_PIDFILE + if [ ! $PID ]; then + return + fi + if [ $PID -gt 0 ]; then + LUCENE_PID=$PID + fi +} + +get_scheduler_pid() { + get_pid $SCHEDULER_PIDFILE + if [ ! $PID ]; then + return + fi + if [ $PID -gt 0 ]; then + SCHEDULER_PID=$PID + fi +} + +is_service_running() { + PID=$1 + if [ "x$PID" != "x" ] && kill -0 $PID 2>/dev/null ; then + RUNNING=1 + else + RUNNING=0 + fi + return $RUNNING +} + +is_soffice_running() { + get_soffice_pid + is_service_running $SOFFICE_PID + RUNNING=$? + if [ $RUNNING -eq 0 ]; then + SOFFICE_STATUS="openoffice not running" + else + SOFFICE_STATUS="openoffice already running" + fi + return $RUNNING +} + +is_lucene_running() { + get_lucene_pid + is_service_running $LUCENE_PID + RUNNING=$? + if [ $RUNNING -eq 0 ]; then + LUCENE_STATUS="lucene not running" + else + LUCENE_STATUS="lucene already running" + fi + return $RUNNING +} + +is_scheduler_running() { + get_scheduler_pid + is_service_running $SCHEDULER_PID + RUNNING=$? + if [ $RUNNING -eq 0 ]; then + SCHEDULER_STATUS="scheduler not running" + else + SCHEDULER_STATUS="scheduler already running" + fi + return $RUNNING +} + +start_soffice() { + is_soffice_running + RUNNING=$? + + if [ $RUNNING -eq 1 ]; then + echo "$0 $ARG: openoffice (pid $SOFFICE_PID) already running" + else + nohup $SOFFICE &> $INSTALL_PATH/var/log/dmsctl.log & + if [ $? -eq 0 ]; then + echo "$0 $ARG: openoffice started at port $SOFFICE_PORT" + ps ax | grep $SOFFICEBIN | awk {'print $1'} > $SOFFICE_PIDFILE + sleep 2 + else + echo "$0 $ARG: openoffice could not be started" + ERROR=3 + fi +fi +} + +stop_soffice() { + NO_EXIT_ON_ERROR=$1 + is_soffice_running + RUNNING=$? + + if [ $RUNNING -eq 0 ]; then + echo "$0 $ARG: $SOFFICE_STATUS" + if [ "x$NO_EXIT_ON_ERROR" != "xno_exit" ]; then + exit + else + return + fi + fi + get_soffice_pid + if killall $SOFFICEFILE; then + echo "$0 $ARG: openoffice stopped" + else + echo "$0 $ARG: openoffice could not be stopped" + ERROR=4 + fi +} + +start_lucene() { + is_lucene_running + RUNNING=$? + + if [ $RUNNING -eq 1 ]; then + echo "$0 $ARG: lucene (pid $LUCENE_PID) already running" + else + cd $INSTALL_PATH/bin/luceneserver + nohup $LUCENE &> $INSTALL_PATH/var/log/dmsctl.log & + if [ $? -eq 0 ]; then + echo "$0 $ARG: lucene started" + ps ax | grep ktlucene.jar | awk {'print $1'} > $LUCENE_PIDFILE + sleep 2 + else + echo "$0 $ARG: lucene could not be started" + ERROR=3 + fi + cd $INSTALL_PATH +fi +} + +stop_lucene() { + NO_EXIT_ON_ERROR=$1 + is_lucene_running + RUNNING=$? + + if [ $RUNNING -eq 0 ]; then + echo "$0 $ARG: $LUCENE_STATUS" + if [ "x$NO_EXIT_ON_ERROR" != "xno_exit" ]; then + exit + else + return + fi + fi + get_lucene_pid + cd $INSTALL_PATH/search2/indexing/bin + $ZEND_DIR/bin/php shutdown.php positive &> $INSTALL_PATH/var/log/dmsctl.log + sleep 5 + if [ $? -eq 0 ]; then + echo "$0 $ARG: lucene stopped" + else + echo "$0 $ARG: lucene could not be stopped" + ERROR=4 + fi +} + +start_scheduler() { + is_scheduler_running + RUNNING=$? + + if [ $RUNNING -eq 1 ]; then + echo "$0 $ARG: scheduler (pid $SCHEDULER_PID) already running" + else + cd $SCHEDULER_PATH + nohup $SCHEDULER &> $INSTALL_PATH/var/log/dmsctl.log & + if [ $? -eq 0 ]; then + echo "$0 $ARG: scheduler started" + ps ax | grep $SCHEDULERBIN | awk {'print $1'} > $SCHEDULER_PIDFILE + sleep 2 + else + echo "$0 $ARG: scheduler could not be started" + ERROR=3 + fi + fi +} + +stop_scheduler() { + NO_EXIT_ON_ERROR=$1 + is_scheduler_running + RUNNING=$? + + if [ $RUNNING -eq 0 ]; then + echo "$0 $ARG: $SCHEDULER_STATUS" + if [ "x$NO_EXIT_ON_ERROR" != "xno_exit" ]; then + exit + else + return + fi + fi + get_scheduler_pid + if kill $SCHEDULER_PID ; then + echo "$0 $ARG: scheduler stopped" + else + echo "$0 $ARG: scheduler could not be stopped" + ERROR=4 + fi +} + +help() { + echo "usage: $0 help" + echo " $0 (start|stop|restart)" + echo " $0 (start|stop|restart) scheduler" + echo " $0 (start|stop|restart) soffice" + echo " $0 (start|stop|restart) lucene" + cat <wizardLocation . DIRECTORY_SEPARATOR . "migrate.lock"); + @touch(SYSTEM_DIR.'var'.DS.'bin'.DS."migrate.lock"); } /** diff --git a/setup/upgrade/upgrade.lock b/setup/upgrade/upgrade.lock deleted file mode 100644 index e69de29..0000000 --- a/setup/upgrade/upgrade.lock +++ /dev/null diff --git a/setup/upgrade/upgradeUtil.php b/setup/upgrade/upgradeUtil.php index 70e3a6b..37cc224 100644 --- a/setup/upgrade/upgradeUtil.php +++ b/setup/upgrade/upgradeUtil.php @@ -52,7 +52,7 @@ class UpgradeUtil extends InstallUtil { * @return boolean */ public function isSystemUpgraded() { - if (file_exists(dirname(__FILE__)."/upgrade.lock")) { + if (file_exists(SYSTEM_DIR.'var'.DS.'bin'.DS."upgrade.lock")) { return true; } @@ -68,7 +68,7 @@ class UpgradeUtil extends InstallUtil { * @return boolean */ public function isMigration() { - if(file_exists("../wizard/migrate.lock")) + if(file_exists(SYSTEM_DIR.'var'.DS.'bin'.DS."migrate.lock")) return true; return false; } diff --git a/setup/upgrade/upgradeWizard.php b/setup/upgrade/upgradeWizard.php index 9e05d1c..688a9c3 100644 --- a/setup/upgrade/upgradeWizard.php +++ b/setup/upgrade/upgradeWizard.php @@ -155,7 +155,7 @@ class UpgradeWizard { * @return void */ private function createUpgradeFile() { - @touch("upgrade.lock"); + @touch(SYSTEM_DIR.'var'.DS.'bin'.DS."upgrade.lock"); } /** @@ -167,7 +167,7 @@ class UpgradeWizard { * @return void */ private function removeUpgradeFile() { - @unlink("upgrade.lock"); + @unlink(SYSTEM_DIR.'var'.DS.'bin'.DS."upgrade.lock"); } /** diff --git a/setup/wizard/iniUtilities.php b/setup/wizard/iniUtilities.php index 8720be7..769d708 100644 --- a/setup/wizard/iniUtilities.php +++ b/setup/wizard/iniUtilities.php @@ -136,14 +136,14 @@ class iniUtilities { $fileHandle = fopen($iniFile, 'wb'); foreach ($this->cleanArray as $section => $items) { if (substr($section, 0, strlen('_blankline_')) === '_blankline_' ) { - fwrite ($fileHandle, "\r\n"); + @fwrite ($fileHandle, "\r\n"); continue; } if (substr($section, 0, strlen('_comment_')) === '_comment_' ) { - fwrite ($fileHandle, "$items\r\n"); + @fwrite ($fileHandle, "$items\r\n"); continue; } - fwrite ($fileHandle, "[".$section."]\r\n"); + @fwrite ($fileHandle, "[".$section."]\r\n"); foreach ($items as $key => $value) { if (substr($key, 0, strlen('_blankline_')) === '_blankline_' ) { fwrite ($fileHandle, "\r\n"); @@ -156,10 +156,10 @@ class iniUtilities { $value = addcslashes($value,''); //fwrite ($fileHandle, $key.' = "'.$value."\"\r\n"); - fwrite ($fileHandle, $key.' = '.$value."\r\n"); + @fwrite ($fileHandle, $key.' = '.$value."\r\n"); } } - fclose($fileHandle); + @fclose($fileHandle); } function itemExists($checkSection, $checkItem) { @@ -179,7 +179,6 @@ class iniUtilities { } function addItem($addSection, $addItem, $value, $itemComment = '', $sectionComment = '') { - if($this->itemExists($addSection, $addItem)) { $this->delItem($addSection, $addItem); } diff --git a/setup/wizard/installUtil.php b/setup/wizard/installUtil.php index 5e041b2..03ebd40 100644 --- a/setup/wizard/installUtil.php +++ b/setup/wizard/installUtil.php @@ -67,7 +67,7 @@ class InstallUtil { * @return boolean */ public function isSystemInstalled() { - if (file_exists(dirname(__FILE__)."/install.lock")) { + if (file_exists(SYSTEM_DIR.'var'.DS.'bin'.DS."install.lock")) { return true; } return false; @@ -363,13 +363,13 @@ class InstallUtil { * @return boolean */ public function canWriteFile($filename) { - $fh = fopen($filename, "w+"); - $fr = fwrite($fh, 'test'); + $fh = @fopen($filename, "w+"); + $fr = @fwrite($fh, 'test'); if($fr === false) { return false; } - fclose($fh); + @fclose($fh); return true; } @@ -714,8 +714,8 @@ class InstallUtil { * @return void */ function deleteMigrateFile() { - if(file_exists("migrate.lock")) - @unlink("migrate.lock"); + if(file_exists(SYSTEM_DIR.'var'.DS.'bin'.DS."migrate.lock")) + @unlink(SYSTEM_DIR.'var'.DS.'bin'.DS."migrate.lock"); } /** @@ -726,7 +726,7 @@ class InstallUtil { * @return boolean */ public function isMigration() { - if(file_exists("migrate.lock")) + if(file_exists(SYSTEM_DIR.'var'.DS.'bin'.DS."migrate.lock")) return true; return false; } diff --git a/setup/wizard/installWizard.php b/setup/wizard/installWizard.php index 437a776..9d72ebe 100644 --- a/setup/wizard/installWizard.php +++ b/setup/wizard/installWizard.php @@ -203,7 +203,7 @@ class InstallWizard { * @return void */ private function createInstallFile() { - @touch("install.lock"); + @touch(SYSTEM_DIR.'var'.DS.'bin'.DS."install.lock"); } /** @@ -215,8 +215,8 @@ class InstallWizard { * @return void */ private function removeInstallFile() { - if(file_exists("install.lock")) - unlink("install.lock"); + if(file_exists(SYSTEM_DIR.'var'.DS.'bin'.DS."install.lock")) + @unlink(SYSTEM_DIR.'var'.DS.'bin'.DS."install.lock"); } /** diff --git a/setup/wizard/installer.php b/setup/wizard/installer.php index aa4e06e..304860b 100644 --- a/setup/wizard/installer.php +++ b/setup/wizard/installer.php @@ -413,7 +413,7 @@ class Installer { * @return void */ private function _completeInstall() { - @touch("install.lock"); + @touch(SYSTEM_DIR.'var'.DS.'bin'.DS."install.lock"); } /** diff --git a/setup/wizard/lib/services/unixLucene.php b/setup/wizard/lib/services/unixLucene.php index 6bdea29..15956f6 100644 --- a/setup/wizard/lib/services/unixLucene.php +++ b/setup/wizard/lib/services/unixLucene.php @@ -210,9 +210,10 @@ class unixLucene extends unixService { echo "$cmd
"; return false; } - $response = $this->util->pexec($cmd); + //$response = $this->util->pexec($cmd); - return $response; +// return $response; + return false; } return true; diff --git a/setup/wizard/lib/services/unixOpenOffice.php b/setup/wizard/lib/services/unixOpenOffice.php index 9ae0128..e7b19be 100644 --- a/setup/wizard/lib/services/unixOpenOffice.php +++ b/setup/wizard/lib/services/unixOpenOffice.php @@ -144,7 +144,8 @@ class unixOpenOffice extends unixService { return false; } - return $this->util->pexec($cmd); + //return $this->util->pexec($cmd); + return false; } return true; diff --git a/setup/wizard/lib/services/unixScheduler.php b/setup/wizard/lib/services/unixScheduler.php index 03dcdcd..c959d31 100644 --- a/setup/wizard/lib/services/unixScheduler.php +++ b/setup/wizard/lib/services/unixScheduler.php @@ -181,7 +181,6 @@ class unixScheduler extends unixService { // TODO : Write sh on the fly? Not sure the reasoning here $source = $this->getSchedulerSourceLoc(); $this->writeSchedulerTask(); -// $logFile = $this->outputDir."scheduler.log"; $logFile = "/dev/null"; @unlink($logFile); if($source) { // Source @@ -194,9 +193,10 @@ class unixScheduler extends unixService { echo "$cmd
"; return ; } - $response = $this->util->pexec($cmd); + //$response = $this->util->pexec($cmd); - return $response; +// return $response; + return false; } public function getName() { diff --git a/setup/wizard/lib/services/windowsScheduler.php b/setup/wizard/lib/services/windowsScheduler.php index 05b8374..b5ccce3 100644 --- a/setup/wizard/lib/services/windowsScheduler.php +++ b/setup/wizard/lib/services/windowsScheduler.php @@ -249,11 +249,11 @@ class windowsScheduler extends windowsService { echo "Attempt to Create {$this->getSchedulerDir()}\\taskrunner.bat
"; } if(is_readable($this->varDir."bin") && is_writable($this->varDir."bin")) { - $fp = fopen($this->getSchedulerDir().""."\\taskrunner.bat", "w+"); + $fp = @fopen($this->getSchedulerDir().""."\\taskrunner.bat", "w+"); $content = "@echo off \n"; $content .= "\"".$this->util->useZendPhp()."php.exe\" "."\"{$this->getSchedulerSource()}\""; - fwrite($fp, $content); - fclose($fp); + @fwrite($fp, $content); + @fclose($fp); } else { echo 'Could not write task runner
'; // TODO: Should not reach this point } diff --git a/setup/wizard/lib/validation/luceneValidation.php b/setup/wizard/lib/validation/luceneValidation.php index ac1f4ea..89dd3a3 100644 --- a/setup/wizard/lib/validation/luceneValidation.php +++ b/setup/wizard/lib/validation/luceneValidation.php @@ -114,10 +114,15 @@ class luceneValidation extends serviceValidation { private $javaExtCheck = 'cross_orange'; public function preset() { - $this->zendBridgeNotInstalled(); // Set bridge not installed - $this->javaVersionInCorrect(); // Set version to incorrect - $this->javaNotInstalled(); // Set java to not installed - $this->setJava(); // Check if java has been auto detected + /* Rely on Script */ + $this->zendBridgeInstalled(); + $this->javaVersionCorrect(); + $this->javaInstalled(); + $this->installed(); +// $this->zendBridgeNotInstalled(); // Set bridge not installed +// $this->javaVersionInCorrect(); // Set version to incorrect +// $this->javaNotInstalled(); // Set java to not installed +// $this->setJava(); // Check if java has been auto detected } /** diff --git a/setup/wizard/steps/configuration.php b/setup/wizard/steps/configuration.php index c3c62b7..8550a36 100644 --- a/setup/wizard/steps/configuration.php +++ b/setup/wizard/steps/configuration.php @@ -668,16 +668,16 @@ class configuration extends Step * @return boolean */ private function writeConfigPath($configPath, $configContent) { - $fp = fopen($configPath, 'w+'); - if(fwrite($fp, $configContent)) + $fp = @fopen($configPath, 'w+'); + if(@fwrite($fp, $configContent)) return true; return false; } private function writeCachePath($cachePath, $cacheContent) { - $fp = fopen($cachePath, 'w+'); + $fp = @fopen($cachePath, 'w+'); if($cacheContent != '') { - if(fwrite($fp, $cacheContent)) + if(@fwrite($fp, $cacheContent)) return true; } return false; diff --git a/setup/wizard/steps/database.php b/setup/wizard/steps/database.php index f5949d3..a9003d4 100644 --- a/setup/wizard/steps/database.php +++ b/setup/wizard/steps/database.php @@ -734,7 +734,7 @@ class database extends Step } private function parse_mysql_dump($url) { - $handle = fopen($url, "r"); + $handle = @fopen($url, "r"); $query = ""; if ($handle) { while (!feof($handle)) { @@ -744,7 +744,7 @@ class database extends Step $query = ''; } } - fclose($handle); + @fclose($handle); } return true; @@ -778,11 +778,13 @@ class database extends Step private function writeBinaries() { $services = $this->util->getDataFromSession('services'); $binaries = $services['binaries']; - foreach ($binaries as $k=>$bin) { - if($k != 1) { - $updateBin = 'UPDATE config_settings c SET c.value = "'.$bin.'" where c.group_name = "externalBinary" and c.display_name = "'.$k.'";'; - $this->util->dbUtilities->query($updateBin); - } + if($binaries) { + foreach ($binaries as $k=>$bin) { + if($k != 1) { + $updateBin = 'UPDATE config_settings c SET c.value = "'.$bin.'" where c.group_name = "externalBinary" and c.display_name = "'.$k.'";'; + $this->util->dbUtilities->query($updateBin); + } + } } // if Windows, hard code (relative to SYSTEM_ROOT) where we expect the Zend MSI installer to have placed them diff --git a/setup/wizard/steps/dependencies.php b/setup/wizard/steps/dependencies.php index 3086f8d..5c4a0a3 100644 --- a/setup/wizard/steps/dependencies.php +++ b/setup/wizard/steps/dependencies.php @@ -333,7 +333,7 @@ class dependencies extends Step */ private function getRequiredExtensions() { $ext = array( - array('extension' => 'fileinfo', 'required' => 'no', 'name' => 'Fileinfo', 'details' => 'Provides better file identification support - not necessary if you use file extensions.'), +// array('extension' => 'fileinfo', 'required' => 'no', 'name' => 'Fileinfo', 'details' => 'Provides better file identification support - not necessary if you use file extensions.'), array('extension' => 'iconv', 'required' => 'no', 'name' => 'IconV', 'details' => 'Used for conversion between character sets.'), array('extension' => 'mysql', 'required' => 'yes', 'name' => 'MySQL', 'details' => 'Used for accessing a MySQL database.'), array('extension' => 'curl', 'required' => 'yes', 'name' => 'cURL', 'details' => 'Allows the connection and communication between different servers types using various protocols.'), diff --git a/setup/wizard/steps/registration.php b/setup/wizard/steps/registration.php index dd883e9..751c0ba 100644 --- a/setup/wizard/steps/registration.php +++ b/setup/wizard/steps/registration.php @@ -183,7 +183,7 @@ class registration extends Step $params['http']['header'] = $optional_headers; } $ctx = stream_context_create($params); - $fp = fopen($url, 'r', false, $ctx); + $fp = @fopen($url, 'r', false, $ctx); if (!$fp) { throw new Exception("Problem with $url, $php_errormsg"); } @@ -192,7 +192,7 @@ class registration extends Step fclose($fp); throw new Exception("Problem reading data from $url, $php_errormsg"); } - fclose($fp); + @fclose($fp); return $response; } diff --git a/setup/wizard/steps/services.php b/setup/wizard/steps/services.php index de221f7..4d71b88 100644 --- a/setup/wizard/steps/services.php +++ b/setup/wizard/steps/services.php @@ -143,8 +143,27 @@ class services extends Step * @return object */ public $schedulerValidation; - + + /** + * List of binaries needed to start service + * + * @author KnowledgeTree Team + * @access public + * @param none + * @return object + */ public $binaries = array(); + + /** + * List of binaries needed to start service + * + * @author KnowledgeTree Team + * @access public + * @param none + * @return object + */ + public $validation = false; + /** * Main control of services setup * @@ -203,6 +222,8 @@ class services extends Step $this->alreadyInstalled = true; $this->serviceCheck = 'tick'; } else { +// $cmd = SYSTEM_DIR."dmsctl.sh start > /dev/null 2>&1 & echo $!"; +// $this->util->pexec($cmd); // First Attempt to start all using bash script foreach ($this->getServices() as $bin=>$service) { $class = strtolower($service)."Validation"; $this->$class->preset(); // Sets defaults @@ -523,6 +544,7 @@ class services extends Step $this->temp_variables['alreadyInstalled'] = $this->alreadyInstalled; $this->temp_variables['serviceCheck'] = $this->serviceCheck; $this->temp_variables['binaries'] = $this->binaries; + $this->temp_variables['validation'] = $this->validation; } diff --git a/setup/wizard/templates/installtype.tpl b/setup/wizard/templates/installtype.tpl index 4764312..c24ba41 100644 --- a/setup/wizard/templates/installtype.tpl +++ b/setup/wizard/templates/installtype.tpl @@ -9,14 +9,14 @@ - + diff --git a/setup/wizard/templates/services.tpl b/setup/wizard/templates/services.tpl index f91232c..9c64788 100644 --- a/setup/wizard/templates/services.tpl +++ b/setup/wizard/templates/services.tpl @@ -40,37 +40,38 @@
- - Specify the location of your Java executable -     - ' style="float:none;"/> -     - Submit -
- -
- - -
- Specify the location of your PHP executable -
- - '/> - - '/> + + + Specify the location of your Java executable +     + ' style="float:none;"/> +     + Submit +
+ +
+ + +
+ Specify the location of your PHP executable +
+ + '/> + + '/> + +     + + + + Specify the location of your Open Office executable +     + ' style="float:none;"/> +     + Submit +
+ -     - - - - Specify the location of your Open Office executable -     - ' style="float:none;"/> -     - Submit -
- -

     "; ?>Java Check

+ All services are already installed. -- libgit2 0.21.4