Peter M. Groen / knowledgetree

Commit 3ab26ce164c30bf13079848280b456642c023355

Authored by Megan Watson
2 parents 10e46a04 f894e1e2

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

Inline Side-by-side
Showing 2 changed files with 11 additions and 8 deletions
setup/wizard/installUtil.php
  View file @3ab26ce
@@ -1061,9 +1061,6 @@ class InstallUtil { @@ -1061,9 +1061,6 @@ class InstallUtil {
1061 1061
1062 // {{{ copyDirectory 1062 // {{{ copyDirectory
1063 function copyDirectory($sSrc, $sDst, $bMove = false) { 1063 function copyDirectory($sSrc, $sDst, $bMove = false) {
1064 - if (file_exists($sDst)) {  
1065 - return false; //PEAR::raiseError(_kt("Destination directory already exists."));  
1066 - }  
1067 if (!WINDOWS_OS) { 1064 if (!WINDOWS_OS) {
1068 if ($bMove && file_exists('/bin/mv')) { 1065 if ($bMove && file_exists('/bin/mv')) {
1069 $this->pexec(array('/bin/mv', $sSrc, $sDst)); 1066 $this->pexec(array('/bin/mv', $sSrc, $sDst));
@@ -1081,15 +1078,13 @@ class InstallUtil { @@ -1081,15 +1078,13 @@ class InstallUtil {
1081 if ($hSrc === false) { 1078 if ($hSrc === false) {
1082 return false; //PEAR::raiseError(sprintf(_kt("Could not open source directory: %s"), $sSrc)); 1079 return false; //PEAR::raiseError(sprintf(_kt("Could not open source directory: %s"), $sSrc));
1083 } 1080 }
1084 - if (@mkdir($sDst, 0777) === false) {  
1085 - return false; //PEAR::raiseError(sprintf(_kt("Could not create destination directory: %s"), $sDst));  
1086 - } 1081 + @mkdir($sDst, 0777);
1087 while (($sFilename = readdir($hSrc)) !== false) { 1082 while (($sFilename = readdir($hSrc)) !== false) {
1088 if (in_array($sFilename, array('.', '..'))) { 1083 if (in_array($sFilename, array('.', '..'))) {
1089 continue; 1084 continue;
1090 } 1085 }
1091 - $sOldFile = sprintf("%s/%s", $sSrc, $sFilename);  
1092 - $sNewFile = sprintf("%s/%s", $sDst, $sFilename); 1086 + $sOldFile = sprintf("%s" . DS . "%s", $sSrc, $sFilename);
  1087 + $sNewFile = sprintf("%s" . DS . "%s", $sDst, $sFilename);
1093 if (is_dir($sOldFile)) { 1088 if (is_dir($sOldFile)) {
1094 $this->copyDirectory($sOldFile, $sNewFile, $bMove); 1089 $this->copyDirectory($sOldFile, $sNewFile, $bMove);
1095 continue; 1090 continue;
setup/wizard/steps/install.php
  View file @3ab26ce
@@ -104,6 +104,14 @@ class install extends step @@ -104,6 +104,14 @@ class install extends step
104 public function installStep() 104 public function installStep()
105 { 105 {
106 $this->callHome(); 106 $this->callHome();
  107 + // copy indexing directory if this is a migration
  108 + $this->setDataFromSession();
  109 + if ($this->util->isMigration()) {
  110 + $migrateSessionData = $this->getDataFromPackage('migrate', 'installation');
  111 + $src = $migrateSessionData['location'] . DS . 'var' . DS . 'indexes';
  112 + $dst = SYSTEM_DIR . 'var' . DS . 'indexes';
  113 + $this->util->copyDirectory($src, $dst);
  114 + }
107 } 115 }
108 116
109 /** 117 /**