Changeset 6858

Timestamp:

09/27/08 00:52:45 (5 years ago)

Author:

p_lindheimer

Message:

move retrieve_op_conf_from_mysql.pl from framework to fw_fop

Files:

• modules/branches/2.5/fw_fop/install.php (modified) (2 diffs)
• modules/branches/2.5/publish.pl (modified) (5 diffs)

modules/branches/2.5/fw_fop/install.php

@@ -68 +68 @@
- * fw_fop install script
- */
+  $bin_source = dirname(__FILE__)."/bin/*";
+  $bin_dest = $amp_conf['AMPBIN']
-
-  $htdocs_panel_source = dirname(__FILE__)."/htdocs_panel/*";
@@ -84 +86 @@
-  }
-
+  exec("cp -rf $bin_source $bin_dest 2>&1",$out,$ret);
+  if ($ret != 0) {
+    fw_fop_print_errors($htdocs_panel_source, $bin_dest, $out);
+  }
+
-?>

modules/branches/2.5/publish.pl

@@ -24 +24 @@
-    # temporarily chosen not to include FOP since it is likely FOP may be handled by a FOP module going forward. Othewise we will add it here.
-    #
-    # TODO: ADD FOP until we can get into a module
-    #
-    if (system("rm -rf $framework/agi-bin $framework/bin $framework/htdocs $framework/htdocs_panel $framework/upgrades $framework/libfreepbx.install.php $framework/CHANGES")) {
@@ -73 +72 @@
-    
-    # Remove from htdocs root mainstyle.css and index.html as these are owned by root (need to investigate why these are there
-Also some others
+Remove retrieve_op_conf_from_mysql.pl now handled by fw_fop. Also some others.
-    #
-    # TODO: check if these are stiff there and need to be special cased
@@ -86 +85 @@
-      die "FATAL: failed to trim modules/_cache\n";
-    }
+    if (system("rm -rf $framework/bin/retrieve_op_conf_from_mysql.pl")) {
+      die "FATAL: failed to trim bin/retrieve_op_conf_from_mysql.pl\n";
+    }
-  }
-  if ($moddir =~ /$fw_fop/) {
-
+
+
+
-    if (system("svn export http://svn.freepbx.org/freepbx/$fwbranch/amp_conf/htdocs_panel $fw_fop/htdocs_panel")) {
-      die "FATAL: failed to export htdocs_panel directory\n";
+    }
+    if (system("svn co --non-recursive http://svn.freepbx.org/freepbx/$fwbranch/amp_conf/bin $fw_fop/tmp")) {
+      die "FATAL: failed to checkout bin\n";
+    }
+    if (system("mkdir $fw_fop/bin")) {
+      die "FATAL: failed to create $fw_fop/bin\n";
+    }
+    if (system("mv $fw_fop/tmp/retrieve_op_conf_from_mysql.pl $fw_fop/bin")) {
+      die "FATAL: failed to mv retrieve_op_conf_from_mysql.pl to $fw_fop/bin\n";
+    }
+    if (system("rm -rf $fw_fop/tmp")) {
+      die "FATAL: failed to remove $fw_fop/tmp\n";
-    }
-
@@ -256 +272 @@
-
-  system("svn update $rawname");
-
+
+
-
-  if ($debug) {
@@ -262 +279 @@
-    print "svn add ../../release/$rver/$filename\n";
-    print "svn ps svn:mime-type application/tgz ../../release/$rver/$filename\n";
-$lastpublish $moddir
+'$lastpublish' $moddir\n
-    print "svn ci ../../release/$rver/$filename $rawname/module.xml -m \"Module Publish Script: $rawname $vers\"\n";
-  } else {