[Pkg-voip-commits] r3224 - freepbx/trunk/debian/contrib

[Diego Iastrubni]

Author: elcuco-guest
Date: 2007-03-11 15:31:29 +0000 (Sun, 11 Mar 2007)
New Revision: 3224

Modified:
   freepbx/trunk/debian/contrib/fpx-modules
Log:
the script was broken for some time, now it can really upgrade modules. tested it once again against a working directory and clean one. it seems to be 
working once again


Modified: freepbx/trunk/debian/contrib/fpx-modules
===================================================================
--- freepbx/trunk/debian/contrib/fpx-modules	2007-03-11 14:46:53 UTC (rev 3223)
+++ freepbx/trunk/debian/contrib/fpx-modules	2007-03-11 15:31:29 UTC (rev 3224)
@@ -311,7 +311,7 @@
 			mkdir("_cache");
 		}
 		
-		if(file_exists($filename)) {
+		if (file_exists($filename)) {
 			unlink($filename);
 		}
 
@@ -341,32 +341,36 @@
 		// in rare cases, you should also modify the initial debian layout a little bit
 		// in about 95% it works out of the box
 		exec_cmd("tar zxf {$filename} --directory=modules");
+
+		// module directories MUST be freepbx-module-$rawname
+		// otherwise lintian shouts
+		exec_cmd( "mkdir -p modules/freepbx-module-$rawname/" );
+		exec_cmd( "cp -a modules/$rawname/* modules/freepbx-module-$rawname/" );
+		exec_cmd( "rm -fr modules/$rawname/" );
+
 		if (!$l_module)	{
 			outn("Installing new module, and using sane defaults");
 			
 			if ($working_in_svn)
-				exec_cmd("svn export template/ modules/$rawname/ --force --quiet");
+				exec_cmd("svn export template/ modules/freepbx-module-$rawname/ --force --quiet");
 			else {
-	 			exec_cmd("cp -a "  . MYDIR . "/template/ modules/$rawname");
- 				exec_cmd("mv modules/$rawname/template/* modules/$rawname/");
- 				exec_cmd("rm -fr modules/$rawname/template/");
+	 			exec_cmd("cp -a "  . MYDIR . "/template/ modules/freepbx-module-$rawname");
+ 				exec_cmd("mv modules/freepbx-module-$rawname/template/* modules/freepbx-module-$rawname");
+ 				exec_cmd("rm -fr modules/freepbx-module-$rawname/template/");
 			}
 		}
 		else {
-			putenv("DEBEMAIL=$debian_maintainer");
-			putenv("DEBFULLNAME=$debian_maintainer");
-			exec_cmd( "cd modules/$rawname/; dch -v \"2.1-$version-1\" \"New upstream release\"" );
+// 			putenv("DEBEMAIL=$debian_maintainer");
+// 			putenv("DEBFULLNAME=$debian_maintainer");
+			outn( "cd modules/freepbx-module-$rawname/; dch -v \"2.2-$version-1\" \"New upstream release\"" );
+			exec_cmd( "cd modules/freepbx-module-$rawname/; dch -v \"2.2-$version-1\" \"New upstream release\"" );
 			outn("Please update the changelog as needed, new entry created.");
 		}
-		exec_cmd( "sed -r -i 's/@@RAWNAME@@/$rawname/g' modules/$rawname/debian/*" );
-		exec_cmd( "sed -r -i 's/@@VERSION@@/$version/g'	modules/$rawname/debian/*" );
-		exec_cmd( "sed -r -i 's/@@NAME@@/$name/g' modules/$rawname/debian/*" );
-		exec_cmd( "sed -r -i 's|@@DATE@@|$date|g' modules/$rawname/debian/*" );
-		exec_cmd( "sed -r -i 's|@@INFO@@|$date|g' modules/$rawname/debian/*" );
-
-		// module directories MUST be freepbx-module-$rawname
-		// otherwise lintian shouts
-		rename( "modules/$rawname/", "modules/freepbx-module-$rawname/" );
+		exec_cmd( "find modules/freepbx-module-$rawname/debian/* -type f | xargs sed -r -i 's/@@RAWNAME@@/$rawname/g' " );
+		exec_cmd( "find modules/freepbx-module-$rawname/debian/* -type f | xargs sed -r -i 's/@@VERSION@@/$version/g' " );
+		exec_cmd( "find modules/freepbx-module-$rawname/debian/* -type f | xargs sed -r -i 's/@@NAME@@/$name/g' " );
+		exec_cmd( "find modules/freepbx-module-$rawname/debian/* -type f | xargs sed -r -i 's|@@DATE@@|$date|g' " );
+		exec_cmd( "find modules/freepbx-module-$rawname/debian/* -type f | xargs sed -r -i 's|@@INFO@@|$date|g' " );
 	}
 	
 	// now we have the most updated modules, download the module list as well
@@ -492,6 +496,11 @@
 	case "build":
 		build_modules( $local_modules );
 		break;
+
+	case "revert":
+		// undocumented function, reverts the current tree 
+		exec_cmd( "svn revert --recursive ." );
+		break;
 		
 	default:
 		showHelp();