Peter M. Groen / knowledgetree

Commit bca47f9178f0de7ffc44fa10a8be8a45d5050b55

Authored by Jarrett Jordaan
1 parent 83f0dcfa

Story ID:1731380 :Fixed batch file for Windows shortcuts 

Committed by: Jarrett Jordaan

Reviewed by: Martin Kirsten
Inline Side-by-side
Showing 7 changed files with 19 additions and 25 deletions
dmsctl.bat
  View file @bca47f9
... ... @@ -4,7 +4,7 @@ rem KnowledgeTree Control Script
4 4  
5 5  
6 6 rem ============= SET ENVIRONMENT VARIABLES ==============
7   -set INSTALL_PATH=%CD%
  7 +set INSTALL_PATH=%~dp0
8 8 cd ..
9 9 cd ..
10 10 set ZEND_PATH=%CD%
... ...
setup/migrate/steps/migrateServices.php
  View file @bca47f9
... ... @@ -214,11 +214,9 @@ class migrateServices extends Step
214 214 *
215 215 */
216 216 private function uninstallServices() {
217   - $this->conf = $this->getDataFromSession("installation"); // Get installation directory
218   - if($this->conf['location'] != '') {
219   - $func = OS."Stop";// Try the dmsctl
220   - $this->$func();
221   - }
  217 + $func = OS."Stop";
  218 + $this->$func();
  219 +
222 220 $this->shutdown();
223 221 }
224 222  
... ... @@ -240,11 +238,11 @@ class migrateServices extends Step
240 238 *
241 239 */
242 240 private function windowsStop() {
243   - $cmd = "sc delete KTLucene";
  241 + $cmd = "sc stop KTLucene; sc delete KTLucene";
244 242 $this->util->pexec($cmd);
245   - $cmd = "sc delete KTScheduler";
  243 + $cmd = "sc stop KTScheduler; sc delete KTScheduler";
246 244 $this->util->pexec($cmd);
247   - $cmd = "sc delete KTOpenoffice";
  245 + $cmd = "sc stop KTOpenoffice; sc delete KTOpenoffice";
248 246 $this->util->pexec($cmd);
249 247 }
250 248  
... ...
setup/migrate/templates/complete.tpl
  View file @bca47f9
... ... @@ -5,7 +5,7 @@
5 5 <?php
6 6 if($errors || $warnings){
7 7 echo '<div>'
8   - . '<a href="http://wiki.knowledgetree.com/Web_Based_Migrater#Post_Migrate" target="_blank">'
  8 + . '<a href="http://wiki.knowledgetree.com/Web_Based_Migrater#Complete" target="_blank">'
9 9 . 'Click Here for help on overcoming post migrate issues</a></div><br/>';
10 10 }
11 11 ?>
... ... @@ -16,7 +16,7 @@
16 16 <span class='<?php echo $sql['class']; ?>'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><?php echo $sql['msg']; ?>
17 17 <br /><br />
18 18 <h3>Start new MySQL service</h3>
19   - 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>).
  19 + 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>).
20 20 <br /><br />
21 21 <?php if(!empty($errors)) { ?>
22 22 <!-- <span class='<?php //echo $ktmysql['class']; ?>'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>-->
... ...
setup/migrate/templates/database.tpl
  View file @bca47f9
... ... @@ -5,9 +5,6 @@
5 5 This step configures the connection to the database server and migrates the database.
6 6 </div>
7 7 <div id="step_content_<?php echo $step_name; ?>" class="step">
8   - <?php
9   - //print_r($errors);
10   - ?>
11 8 <?php if(empty($errors)) { ?>
12 9 <p class="description">The Setup Wizard will now export your existing database in preparation for the migration to the new KnowledgeTree Stack.</p><br />
13 10 <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.
... ...
setup/wizard/lib/services/windowsOpenOffice.php
  View file @bca47f9
... ... @@ -130,7 +130,7 @@ class windowsOpenOffice extends windowsService {
130 130 * @param none
131 131 * @return string
132 132 */
133   - public $name = "KTOpenOffice";
  133 + public $name = "KTOpenoffice";
134 134  
135 135 public $hrname = "KnowledgeTree OpenOffice.org Service. (KTOpenOffice)";
136 136  
... ...
setup/wizard/lib/services/windowsScheduler.php
  View file @bca47f9
... ... @@ -234,15 +234,15 @@ class windowsScheduler extends windowsService {
234 234 if($state == '') {
235 235 $this->writeTaskRunner();
236 236 //if (function_exists('win32_create_service')) { // TODO what if it does not exist? check how the dmsctl.bat does this
237   - if(DEBUG) {
238   - echo '<pre>';
239   - print_r(array('service' => $this->name, 'display' => $this->name, 'path' => $this->getSchedulerScriptPath()));
240   - echo '</pre>';
241   - echo '<pre>';
242   - print_r(file_get_contents($this->getSchedulerScriptPath()));
243   - echo '</pre>';
244   - return ;
245   - }
  237 +// if(DEBUG) {
  238 +// echo '<pre>';
  239 +// print_r(array('service' => $this->name, 'display' => $this->name, 'path' => $this->getSchedulerScriptPath()));
  240 +// echo '</pre>';
  241 +// echo '<pre>';
  242 +// print_r(file_get_contents($this->getSchedulerScriptPath()));
  243 +// echo '</pre>';
  244 +// return ;
  245 +// }
246 246 /*
247 247 $response = win32_create_service(array(
248 248 'service' => $this->name,
... ...
setup/wizard/templates/license.tpl
  View file @bca47f9
... ... @@ -4,7 +4,6 @@
4 4 foreach($errors as $k=>$e) {
5 5 echo "<span class='error'>".$e."</span>";
6 6 }
7   - //print_r($errors);
8 7 }?>
9 8 <p class="description_1">
10 9 Please read and accept the license agreement below before continuing with the setup.
... ...