Merge branch 'edge' of github.com:ktgit/knowledgetree into edge

Paul Barrett
2 parents 5615b79f cfaa99dc
Showing 3 changed files with 19 additions and 15 deletions
dmsctl.sh
setup/wizard/steps/database.php
setup/wizard/templates/complete.tpl
@@ -302,7 +302,7 @@ firstrun() {
         	fi
 	fi
-	touch $INSTALL_PATH/var/bin/.dmsinit.lock
+	touch $INSTALL_PATH/var/bin/dmsinit.lock
 	$ZEND_DIR/bin/zendctl.sh restart
 }
@@ -320,7 +320,7 @@ if [ &quot;x$3&quot; != &quot;x&quot; ]; then
 fi
 # Are we running for first time
-[[ -e $INSTALL_PATH/var/bin/.dmsinit.lock ]] || firstrun
+[[ -e $INSTALL_PATH/var/bin/dmsinit.lock ]] || firstrun
 case $1 in
        help)   help
@@ -776,17 +776,6 @@ class database extends Step
     }
     private function writeBinaries() {
-    	$services = $this->util->getDataFromSession('services');
-    	$binaries = $services['binaries'];
-    	if($binaries) {
-	    	foreach ($binaries as $k=>$bin) {
-	    		if($k != 1) {
-	    			$updateBin = 'UPDATE config_settings c SET c.value = "'.str_replace('\\', '\\\\', $bin).'" where c.group_name = "externalBinary" and c.display_name = "'.$k.'";';
-					$this->util->dbUtilities->query($updateBin);
-	    		}
-	    	}
-    	}
-    	
     	// if Windows, attempt to insert full paths to binaries
     	if (WINDOWS_OS) {
     	    $winBinaries = array('php' => array(0 => 'externalBinary', 1 => 'ZendServer\bin\php.exe'), 
@@ -825,7 +814,21 @@ class database extends Step
     	// if Linux?
     	else {
     	    // TODO python binary?
-    	    // TODO other binaries?
+    	    // Python
+	    	$services = $this->util->getDataFromSession('services');
+	    	$binaries = $services['binaries'];
+    	    $python = "/usr/bin/python";
+    	    if(file_exists($python)) {
+    	    	$binaries['python'] = $python;
+    	    }
+	    	if($binaries) {
+		    	foreach ($binaries as $k=>$bin) {
+		    		if($k != 1) {
+		    			$updateBin = 'UPDATE config_settings c SET c.value = "'.str_replace('\\', '\\\\', $bin).'" where c.group_name = "externalBinary" and c.display_name = "'.$k.'";';
+						$this->util->dbUtilities->query($updateBin);
+		    		}
+		    	}
+	    	}
     	}
     }
@@ -17,7 +17,7 @@
 	<?php if(!$servicesValidation) { ?>
 		<h3>Services</h3>
 		The KnowledgeTree services need to be started to allow for optimal functioning of the search, indexing and pdf generation.
-		<?php if(WINDOWS_OS) { ?>
+		<?php if(!WINDOWS_OS) { ?>
 		To start the services, execute the dmsctl.sh shell script in the KnowledgeTree directory from a terminal.<br/><br/>
 		<?php } else { ?>
 		To start the services, execute the dmsctl.bat batch file in the KnowledgeTree directory from a command prompt, run as administrator.<br/><br/>
@@ -25,6 +25,7 @@
 		<p class="disclaimer">
 		<?php if(WINDOWS_OS) { ?>
 		cd KnowledgeTree_Installation_Folder<br/>
+		dmsctl.bat install
 		dmsctl.bat start
 		<?php } else { ?>
 		cd /usr/share/knowledgetree-ce<br/>