Peter M. Groen / knowledgetree

Commit d2dc48c0e353e203ac1e81292af30f1cbb4d2553

Authored by Jarrett Jordaan
1 parent 1e8d94d3

KTS4498-Updated windows paths 

Committed by: Jarrett Jordaan

Reviewed by: Prince Mbekwa
Inline Side-by-side
Showing 2 changed files with 28 additions and 26 deletions
dmsctl.bat
  View file @d2dc48c
... ... @@ -6,6 +6,7 @@ rem KnowledgeTree Control Script
6 6 rem ============= SET ENVIRONMENT VARIABLES ==============
7 7 set INSTALL_PATH=%CD%
8 8 cd ..
  9 +cd ..
9 10 set ZEND_PATH=%CD%
10 11 cd %INSTALL_PATH%
11 12 set JAVA_BIN=%ZEND_PATH%\jre\bin\java.exe
... ... @@ -82,4 +83,4 @@ echo The Scheduler automatic service was successfully installed
82 83 IF EXIST "%INSTALL_PATH%\var\bin\luceneinstall.bat" call "%INSTALL_PATH%\var\bin\luceneinstall.bat"
83 84 goto end
84 85  
85   -:end
86 86 \ No newline at end of file
  87 +:end
... ...
setup/wizard/installUtil.php
  View file @d2dc48c
... ... @@ -47,7 +47,7 @@ class InstallUtil {
47 47 private $salt = 'installers';
48 48 public $dbUtilities = null;
49 49 public $iniUtilities = null;
50   -
  50 +
51 51 /**
52 52 * Constructs installation object
53 53 *
... ... @@ -83,9 +83,9 @@ class InstallUtil {
83 83 include($file);
84 84 $contents = ob_get_contents();
85 85 ob_end_clean();
86   - echo $contents;
  86 + echo $contents;
87 87 }
88   -
  88 +
89 89 return false;
90 90  
91 91 }
... ... @@ -460,7 +460,7 @@ class InstallUtil {
460 460 return preg_replace('/java:/', '', $r);
461 461 }
462 462 }
463   -
  463 +
464 464 return '';
465 465 }
466 466  
... ... @@ -530,10 +530,10 @@ class InstallUtil {
530 530 return true;
531 531 }
532 532 }
533   -
  533 +
534 534 return false;
535 535 }
536   -
  536 +
537 537 /**
538 538 * Check if system needs to be migrated
539 539 *
... ... @@ -548,10 +548,10 @@ class InstallUtil {
548 548 return true;
549 549 }
550 550 }
551   -
  551 +
552 552 return false;
553 553 }
554   -
  554 +
555 555 /**
556 556 * Check if system needs to be migrated
557 557 *
... ... @@ -566,10 +566,10 @@ class InstallUtil {
566 566 return true;
567 567 }
568 568 }
569   -
  569 +
570 570 return false;
571 571 }
572   -
  572 +
573 573 /**
574 574 * Check if system needs to be migrated
575 575 *
... ... @@ -584,10 +584,10 @@ class InstallUtil {
584 584 return true;
585 585 }
586 586 }
587   -
  587 +
588 588 return false;
589 589 }
590   -
  590 +
591 591 /**
592 592 * Get session data from package
593 593 *
... ... @@ -600,10 +600,10 @@ class InstallUtil {
600 600 if(empty($_SESSION[$package][$class])) {
601 601 return false;
602 602 }
603   -
  603 +
604 604 return $_SESSION[$package][$class];
605 605 }
606   -
  606 +
607 607 /**
608 608 * Get session data from post
609 609 *
... ... @@ -688,7 +688,7 @@ class InstallUtil {
688 688 /**
689 689 * Deletes migration lock file if a clean install is chosen
690 690 * This is in case someone changes their mind after choosing upgrade/migrate and clicks back up to this step
691   - *
  691 + *
692 692 * @author KnowledgeTree Team
693 693 * @access public
694 694 * @return void
... ... @@ -710,10 +710,10 @@ class InstallUtil {
710 710 return true;
711 711 return false;
712 712 }
713   -
  713 +
714 714 /**
715 715 * Determine type of installation
716   - *
  716 + *
717 717 * @author KnowledgeTree Team
718 718 * @access public
719 719 * @return string
... ... @@ -732,10 +732,10 @@ class InstallUtil {
732 732 }
733 733 }
734 734 }
735   -
  735 +
736 736 /**
737 737 * Determine if zend php exists
738   - *
  738 + *
739 739 * @author KnowledgeTree Team
740 740 * @access public
741 741 * @return string
... ... @@ -746,6 +746,7 @@ class InstallUtil {
746 746 $sysdir = explode(DS, SYSTEM_DIR);
747 747 array_pop($sysdir);
748 748 array_pop($sysdir);
  749 + array_pop($sysdir);
749 750 $zendsys = '';
750 751 foreach ($sysdir as $v) {
751 752 $zendsys .= $v.DS;
... ... @@ -757,13 +758,13 @@ class InstallUtil {
757 758 return DS."usr".DS."local".DS."zend".DS."bin".DS;
758 759 }
759 760 }
760   -
  761 +
761 762 return false;
762 763 }
763   -
  764 +
764 765 /**
765 766 * Determine if mysql exists
766   - *
  767 + *
767 768 * @author KnowledgeTree Team
768 769 * @access public
769 770 * @return string
... ... @@ -780,14 +781,14 @@ class InstallUtil {
780 781 }
781 782 }
782 783 }
783   -
  784 +
784 785 return "mysql"; // Assume its linux and can be executed from command line
785 786 }
786 787  
787 788 public function sqlInstallDir() {
788 789 return SYSTEM_DIR."sql".DS."mysql".DS."install".DS;
789 790 }
790   -
  791 +
791 792 public function getFileByLine($file) {
792 793 $fileLines = array();
793 794 $file_handle = fopen($file, "rb");
... ... @@ -799,7 +800,7 @@ class InstallUtil {
799 800 fclose($file_handle);
800 801 return $fileLines;
801 802 }
802   -
  803 +
803 804 /**
804 805 * Portably execute a command on any of the supported platforms.
805 806 *
... ...