Changeset 2706

Timestamp:

10/15/06 20:04:33 (7 years ago)

Author:

qldrob

Message:

Add temporary support for non-release versions of Asterisk, and make engine checking a bit more modular

Files:

• freepbx/trunk/install_amp (modified) (6 diffs)

freepbx/trunk/install_amp

@@ -88 +88 @@
-  out("  --force-version <ver>    Force upgrade from version <ver>");
-  out("  --no-files               Just run updates without installing files");
+  out("  --my-svn-is-correct      Ignore Asterisk version, assume it is correct");
+  out("  --engine <name>          Use the specified PBX Engine ('asterisk' or 'openpbx')");
-}
-
@@ -575 +577 @@
-// **** Parse out command-line options
-$shortopts = "h?u:p:";
-
+,"my-svn-is-correct","engine"
-
-$args = Console_Getopt::getopt(Console_Getopt::readPHPArgv(), $shortopts, $longopts);
@@ -587 +589 @@
-$dryrun = false;
-$install_files = true;
+$override_astvers = false;
-
-//initialize variables to avoid php notices
@@ -631 +634 @@
-      $install_files = false;
-      out("Running upgrade only, without installing files.");
+    break;
+    case "--my-svn-is-correct":
+      $override_astvers = true;
+    break;
+    case "--engine":
+      $pbx_engine = $arg[1];
+      if ($pbx_engine != 'asterisk') {
+        fatal('Currently only "asterisk" is supported as a PBX engine');
+      }
-    break;
-/*    case "--fopwebroot":
@@ -783 +795 @@
-if (isset($asterisk_conf['astlogdir'])) { $amp_conf['ASTLOGDIR'] = $asterisk_conf['astlogdir']; }
-
+if (!isset($pbx_engine)) { $pbx_engine='asterisk'; }
+out("Using $pbx_engine as PBX Engine");
+$amp_conf["AMPENGINE"]=$pbx_engine;
+
-write_amportal_conf(AMP_CONF, $amp_conf);
-
@@ -813 +829 @@
-  }
-  out("OK");
+} elseif (preg_match('/^Asterisk SVN.+/', $verinfo)) {
+  out("FAIL");
+  out("*** WARNING ***");
+  out("You are not using a released version of Asterisk. We are unable to verify");
+  out("that your Asterisk version is compatible with FreePBX. Whilst this probably");
+  out("won't cause any problems, YOU NEED TO BE CERTAIN that it is compatible");
+  out("with at least the released Asterisk version ".REQ_ASTERISK_VERSION."." );
+  if ($override_astvers==false) {
+    out("If you are SURE that this is compatible, you can re-run ".$argv[0]." with");
+    out("the parameter --my-svn-is-correct");
+    exit;
+  } else {
+    out("--my-svn-is-correct specified, continuing");
+  }
-} else {
-  fatal("Could not determine asterisk version (got: \"".$verinfo."\" please report this)");