Changeset 1456

Timestamp:

04/09/06 19:33:16 (7 years ago)

Author:

mheydon1973

Message:

Install script wasn't running sql files first

Files:

• freepbx/trunk/install_amp (modified) (2 diffs)
• freepbx/trunk/upgrades/2.1beta1/upgrade.php (added)

freepbx/trunk/install_amp

@@ -315 +315 @@
-  
-  if (is_dir(UPGRADE_DIR."/".$version)) {
+    // sql scripts first
-    $dir = opendir(UPGRADE_DIR."/".$version);
-    while ($file = readdir($dir)) {
@@ -338 +339 @@
-            }
-          }
-          
-        } else if (strtolower(substr($file,-4)) == ".php") {
-          out("-> Running PHP script ".UPGRADE_DIR."/".$version."/".$file);
-          if (!$dryrun) {
-            run_included(UPGRADE_DIR."/".$version."/".$file);
-          }
-          
-        } else if (is_executable(UPGRADE_DIR."/".$version."/".$file)) {
-          out("-> Executing ".UPGRADE_DIR."/".$version."/".$file);
-          if (!$dryrun) {
-            exec(UPGRADE_DIR."/".$version."/".$file);
-          }
-        } else {
-          error("-> Don't know what to do with ".UPGRADE_DIR."/".$version."/".$file);
-        }
-      }
-    }
+
+                // now non sql scripts
+                $dir = opendir(UPGRADE_DIR."/".$version);
+                while ($file = readdir($dir)) {
+                        if (($file[0] != ".") && is_file(UPGRADE_DIR."/".$version."/".$file)) {
+                                if (strtolower(substr($file,-4)) == ".sql") {
+          // sql scripts were dealt with first
+                                } else if (strtolower(substr($file,-4)) == ".php") {
+                                        out("-> Running PHP script ".UPGRADE_DIR."/".$version."/".$file);
+                                        if (!$dryrun) {
+                                                run_included(UPGRADE_DIR."/".$version."/".$file);
+                                        }
+
+                                } else if (is_executable(UPGRADE_DIR."/".$version."/".$file)) {
+                                        out("-> Executing ".UPGRADE_DIR."/".$version."/".$file);
+                                        if (!$dryrun) {
+                                                exec(UPGRADE_DIR."/".$version."/".$file);
+                                        }
+                                } else {
+                                        error("-> Don't know what to do with ".UPGRADE_DIR."/".$version."/".$file);
+                                }
+                        }
+                }
+
-  }
-}