Story ID:1731380 :Fixed batch file for Windows shortcuts

Committed by: Jarrett Jordaan Reviewed by: Martin Kirsten

Story ID:1731380 :Fixed batch file for Windows shortcuts
Committed by: Jarrett Jordaan Reviewed by: Martin Kirsten
Jarrett Jordaan
1 parent 83f0dcfa
Showing 7 changed files with 19 additions and 25 deletions
dmsctl.bat
setup/migrate/steps/migrateServices.php
setup/migrate/templates/complete.tpl
setup/migrate/templates/database.tpl
setup/wizard/lib/services/windowsOpenOffice.php
setup/wizard/lib/services/windowsScheduler.php
setup/wizard/templates/license.tpl
@@ -4,7 +4,7 @@ rem KnowledgeTree Control Script
 rem ============= SET ENVIRONMENT VARIABLES ==============
-set INSTALL_PATH=%CD%
+set INSTALL_PATH=%~dp0
 cd ..
 cd ..
 set ZEND_PATH=%CD%
@@ -214,11 +214,9 @@ class migrateServices extends Step
      *
      */
     private function uninstallServices() {
-    	$this->conf = $this->getDataFromSession("installation"); // Get installation directory
-    	if($this->conf['location'] != '') {
-			$func = OS."Stop";// Try the dmsctl
-			$this->$func();
-    	}
+		$func = OS."Stop";
+		$this->$func();
+
 		$this->shutdown();
     }
@@ -240,11 +238,11 @@ class migrateServices extends Step
      *
      */
     private function windowsStop() {
-    	$cmd = "sc delete KTLucene";
+    	$cmd = "sc stop KTLucene; sc delete KTLucene";
     	$this->util->pexec($cmd);
-    	$cmd = "sc delete KTScheduler";
+    	$cmd = "sc stop KTScheduler; sc delete KTScheduler";
     	$this->util->pexec($cmd);
-    	$cmd = "sc delete KTOpenoffice";
+    	$cmd = "sc stop KTOpenoffice; sc delete KTOpenoffice";
     	$this->util->pexec($cmd);
     }
@@ -5,7 +5,7 @@
 	<?php
 	if($errors || $warnings){
 	    echo '<div>'
-	       . '<a href="http://wiki.knowledgetree.com/Web_Based_Migrater#Post_Migrate" target="_blank">'
+	       . '<a href="http://wiki.knowledgetree.com/Web_Based_Migrater#Complete" target="_blank">'
 	       . 'Click Here for help on overcoming post migrate issues</a></div><br/>';
 	}
 	?>
@@ -16,7 +16,7 @@
 		<span class='<?php echo $sql['class']; ?>'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><?php echo $sql['msg']; ?>
 		<br /><br />
 		<h3>Start new MySQL service</h3>
-		In order to complete the upgrade process please start the Zend Server MySQL service and then click <b>Next</b> to continue (<a href="http://wiki.knowledgetree.com/Web_Based_Migrater#Deactivate_Services" target="_blank">Click here for help</a>). 
+		In order to complete the upgrade process please start the Zend Server MySQL service and then click <b>Next</b> to continue (<a href="http://wiki.knowledgetree.com/Web_Based_Migrater#Complete" target="_blank">Click here for help</a>). 
 		<br /><br />
 		<?php if(!empty($errors)) { ?>
 <!--		<span class='<?php //echo $ktmysql['class']; ?>'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>-->
@@ -5,9 +5,6 @@
 		This step configures the connection to the database server and migrates the database.
 		</div>
 		<div id="step_content_<?php echo $step_name; ?>" class="step">
-		<?php
-			//print_r($errors);
-		?>
 		<?php if(empty($errors)) { ?>
 <p class="description">The Setup Wizard will now export your existing database in preparation for the migration to the new KnowledgeTree Stack.</p><br />
                         <span class="error">Please ensure that your database is backed up before proceeding. If you need assistance with backing up see the &nbsp;<a class="description_click" target="_blank" href="http://wiki.knowledgetree.com/Backing_up_and_restoring_KnowledgeTree">'Backing up and restoring KnowledgeTree'</a>&nbsp; wiki entry.
@@ -130,7 +130,7 @@ class windowsOpenOffice extends windowsService {
 	* @param none
 	* @return string
  	*/
-    public $name = "KTOpenOffice";
+    public $name = "KTOpenoffice";
     public $hrname = "KnowledgeTree OpenOffice.org Service. (KTOpenOffice)";
@@ -234,15 +234,15 @@ class windowsScheduler extends windowsService {
 		if($state == '') {
 			$this->writeTaskRunner();
             //if (function_exists('win32_create_service')) { // TODO what if it does not exist? check how the dmsctl.bat does this
-            	if(DEBUG) {
-            		echo '<pre>';
-            		print_r(array('service' => $this->name, 'display' => $this->name, 'path' => $this->getSchedulerScriptPath()));
-    	            echo '</pre>';
-    	            echo '<pre>';
-    	            print_r(file_get_contents($this->getSchedulerScriptPath()));
-    	            echo '</pre>';
-            		return ;
-            	}
+//            	if(DEBUG) {
+//            		echo '<pre>';
+//            		print_r(array('service' => $this->name, 'display' => $this->name, 'path' => $this->getSchedulerScriptPath()));
+//    	            echo '</pre>';
+//    	            echo '<pre>';
+//    	            print_r(file_get_contents($this->getSchedulerScriptPath()));
+//    	            echo '</pre>';
+//            		return ;
+//            	}
             	/*
     			$response = win32_create_service(array(
     	            'service' => $this->name,
@@ -4,7 +4,6 @@
         foreach($errors as $k=>$e) {
                 echo "<span class='error'>".$e."</span>";
         }
-        //print_r($errors);
     }?>
 <p class="description_1">
 Please read and accept the license agreement below before continuing with the setup.