Peter M. Groen / knowledgetree

Commit f5ea4f8c326f62b2ba3b33e4c2b2ddd38d87a887

Authored by Jarrett Jordaan
1 parent d45b39f2

Modifed folders upgrade sql 

Committed by: Jarrett Jordaan

Reviewed by: Paul Barrett
Inline Side-by-side
Showing 1 changed file with 4 additions and 4 deletions
setup/migrate/steps/migrateDatabase.php
  View file @f5ea4f8
... ... @@ -126,10 +126,10 @@ class migrateDatabase extends Step
126 126 $tmpFolder = $this->resolveTempDir();
127 127 if(WINDOWS_OS) {
128 128 $termOrBash = "command prompt window";
129   - $exe = "\"$location".DS."mysql".DS."bin".DS."mysqldump\""; // Location of dump
  129 + $exe = "$location".DS."mysql".DS."bin".DS."mysqldump.exe".DS;
130 130 } else {
131 131 $termOrBash = "terminal window";
132   - $exe = DS."$location".DS."mysql".DS."bin".DS."mysqldump.exe".DS;
  132 + $exe = "\"$location".DS."mysql".DS."bin".DS."mysqldump\""; // Location of dump
133 133 }
134 134 $date = date('Y-m-d-H-i-s');
135 135 if(isset($database['manual_export'])) {
... ... @@ -156,9 +156,9 @@ class migrateDatabase extends Step
156 156 }
157 157 // Handle failed dump
158 158 if(WINDOWS_OS) {
159   - $sqlFile = "/tmp/kt-backup-$date.sql"; // Use tmp instead due to permissions
  159 + $sqlFile = "C:\\kt-backup-$date.sql"; // Use tmp instead due to permissions
160 160 } else {
161   - $sqlFile = "C:\kt-backup-$date.sql"; // Use tmp instead due to permissions
  161 + $sqlFile = "/tmp/kt-backup-$date.sql"; // Use tmp instead due to permissions
162 162 }
163 163 $cmd = $exe.' -u"'.$dbAdminUser.'" -p"'.$dbAdminPass.'" --port="'.$port.'" '.$dbName.' > '.$sqlFile;
164 164 $this->error[]['error'] = "Could not export database:";
... ...