Commit ea6f8f46276e96b1b9dcac343688ccf89af9c755
1 parent
301068df
KTS4498-Updated windows paths
Committed by: Jarrett Jordaan Reviewed by: Prince Mbekwa
Showing
1 changed file
with
23 additions
and
0 deletions
setup/wizard/installUtil.php
| ... | ... | @@ -776,6 +776,26 @@ class InstallUtil { |
| 776 | 776 | $jvm = $zendsys."jre".DS."bin".DS."client".DS."jvm.dll"; |
| 777 | 777 | if(file_exists($jvm)) |
| 778 | 778 | return $jvm; |
| 779 | + } | |
| 780 | + } | |
| 781 | + | |
| 782 | + return false; | |
| 783 | + } | |
| 784 | + | |
| 785 | + public function useZendJava() { | |
| 786 | + if($this->installEnvironment() == 'Zend') { | |
| 787 | + if(WINDOWS_OS) { // For Zend Installation only | |
| 788 | + $sysdir = explode(DS, SYSTEM_DIR); | |
| 789 | + array_pop($sysdir); | |
| 790 | + array_pop($sysdir); | |
| 791 | + array_pop($sysdir); | |
| 792 | + $zendsys = ''; | |
| 793 | + foreach ($sysdir as $v) { | |
| 794 | + $zendsys .= $v.DS; | |
| 795 | + } | |
| 796 | + $jvm = $zendsys."jre".DS."bin".DS."client".DS."jvm.dll"; | |
| 797 | + if(file_exists($jvm)) | |
| 798 | + return $jvm; | |
| 779 | 799 | } else { |
| 780 | 800 | $java = "/usr/bin/java"; |
| 781 | 801 | if(file_exists($java)) { |
| ... | ... | @@ -919,5 +939,8 @@ class InstallUtil { |
| 919 | 939 | return join(" ", $aSafeArgs); |
| 920 | 940 | } |
| 921 | 941 | |
| 942 | + /* | |
| 943 | + Just Because. | |
| 944 | + */ | |
| 922 | 945 | } |
| 923 | 946 | ?> | ... | ... |