Changeset 12752

Timestamp:

10/04/11 10:35:36 (2 years ago)

Author:

mbrevda

Message:

re #5934 - run hoks before anything else, so that we can validate/ci any of the hooks work

Files:

• modules/branches/2.10/framework/package_hook.php (modified) (3 diffs)
• modules/branches/2.10/package.php (modified) (2 diffs)

modules/branches/2.10/framework/package_hook.php

@@ -3 +3 @@
-//remove stale files
-if(!run_cmd('rm -rf ' . $vars['fw'] . '/agi-bin ' 
-
-
-
-
-
-
+ 
+ 
+ 
+ 
+ 
+ 
-) {
-  die('FATAL: failed to remove previously exported directories' . PHP_EOL);
@@ -33 +33 @@
-if(!run_cmd('echo SVN VERSION: `svn info ' . $vars['svn_path'] . '/' . $vars['fw'] 
-      . '|grep Revision:|awk \'{print $2}\'` > ' 
-
+   
-) {
-  die('FATAL: ailed to create svnversion.txt' . PHP_EOL);
@@ -44 +44 @@
-//retrieve_op_conf_from_mysql.pl now handled by fw_fop
-if(!run_cmd('rm -rf ' . $vars['fw'] . '/htdocs/recordings ' 
-
-
-
-
-
+ 
+ 
+ 
+ 
+ 
-) {
-  die('FATAL: failed to cleanup' . PHP_EOL);

modules/branches/2.10/package.php

@@ -85 +85 @@
-  $parser = new xml2ModuleArray($xml);
-  $xmlarray = $parser->parseAdvanced($xml);
+  
+  //include module specifc hook, if present
+  if (file_exists($mod . '/' . 'package_hook.php')) {
+    echo 'Running ' . $mod . '/' . 'package_hook.php...' . PHP_EOL;
+    include($mod . '/' . 'package_hook.php');
+  }
+  
+  //include any global hooks, if present
+  if (file_exists('package_hook.php')) {
+    echo 'Running ' . 'package_hook.php...' . PHP_EOL;
+    include('package_hook.php');
+  }
-  
-  //TODO: not sure how to detect a broken xml --MB
@@ -119 +131 @@
-      }
-    }
-  }
-  
-  //include module specifc hook, if present
-  if (file_exists($mod . '/' . 'package_hook.php')) {
-    include($mod . '/' . 'package_hook.php');
-  }
-  
-  //include any global hooks, if present
-  if (file_exists('package_hook.php')) {
-    include('package_hook.php');
-  }
-