cvs: pearweb /public_html go-pear

pajoye          Fri Jun 16 14:46:23 2006 UTC

  Modified files:              
    /pearweb/public_html        go-pear 
  Log:
  - fix go-pear-bundle local packages support
  - fix cvs checkout urls
  
  
http://cvs.php.net/viewcvs.cgi/pearweb/public_html/go-pear?r1=1.94&r2=1.95&diff_format=u
Index: pearweb/public_html/go-pear
diff -u pearweb/public_html/go-pear:1.94 pearweb/public_html/go-pear:1.95
--- pearweb/public_html/go-pear:1.94    Thu Jun 15 23:03:43 2006
+++ pearweb/public_html/go-pear Fri Jun 16 14:46:23 2006
@@ -18,7 +18,7 @@
 # |          Pierre-Alain Joye <pierre@xxxxxxx>                          |
 # |          Greg Beaver <cellog@xxxxxxx>                                |
 # +----------------------------------------------------------------------+
-# $Id: go-pear,v 1.94 2006/06/15 23:03:43 pajoye Exp $
+# $Id: go-pear,v 1.95 2006/06/16 14:46:23 pajoye Exp $
 #
 # Automatically download all the files needed to run the "pear" command
 # (the PEAR package installer).  Requires PHP 4.1.0 or newer.
@@ -187,9 +187,9 @@
     );
 
 if (WEBINSTALLER) {
-    $installer_packages[] = 'HTML_Template_IT';
-    $installer_packages[] = 'Net_UserAgent_Detect';
-    $installer_packages[] = 'PEAR_Frontend_Web';
+    $installer_packages[] = 'HTML_Template_IT-stable';
+    $installer_packages[] = 'Net_UserAgent_Detect-stable';
+    $installer_packages[] = 'PEAR_Frontend_Web-alpha';
 }
 
 $pfc_packages = array(
@@ -644,10 +644,11 @@
 }
 
 foreach ($installer_packages as $pkg) {
-    if (isset($local_dir[$pkg])) {
+    $pkg_basename = substr($pkg, 0, strpos($pkg, '-'));
+    if (isset($local_dir[$pkg_basename])) {
         echo str_pad("Using local package: $pkg", max(38,21+strlen($pkg)+4), 
'.');
-        copy(dirname(__FILE__) . '/go-pear-bundle/' . $local_dir[$pkg], 
$local_dir[$pkg]);
-        $tarball[$pkg] = $local_dir[$pkg];
+        copy(dirname(__FILE__) . '/go-pear-bundle/' . 
$local_dir[$pkg_basename], $local_dir[$pkg_basename]);
+        $tarball[$pkg_basename] = $local_dir[$pkg_basename];
         echo "ok\n";
         displayHTMLProgress($progress += round(65 / count($to_install)));
         continue;
@@ -688,7 +689,9 @@
 
 print 'Bootstrapping: Archive_Tar............';
 $r = 'RELEASE_' . ereg_replace('[^A-Za-z0-9]', '_', 
substr(substr($tarball['Archive_Tar'], 12), 0, -4));
-$url = 
"http://cvs.php.net/viewcvs.cgi/*checkout*/pear/Archive_Tar/Archive/Tar.php?pathrev=$r";;
+
+/* force to a known revision */
+$url = 
"http://cvs.php.net/viewcvs.cgi/pear/Archive_Tar/Archive/Tar.php?view=co&pathrev=RELEASE_1_3_2";;
 mkdir('Archive', 0700);
 
 if (in_array('Tar.php', $local_dir)) {
@@ -702,7 +705,7 @@
 
 print 'Bootstrapping: Console_Getopt.........';
 $r = 'RELEASE_' . ereg_replace('[^A-Za-z0-9]', '_', 
substr(substr($tarball['Console_Getopt'], 15), 0, -4));
-$url = 
"http://cvs.php.net/viewcvs.cgi/*checkout*/pear-core/Console/Getopt.php?pathrev=$r";;
+$url = 
"http://cvs.php.net/viewcvs.cgi/pear-core/Console/Getopt.php?view=co&pathrev=PEAR_1_4";;
 mkdir('Console', 0700);
 if (in_array('Getopt.php', $local_dir)) {
     copy(dirname(__FILE__).'/go-pear-bundle/Getopt.php', 'Console/Getopt.php');
@@ -744,6 +747,7 @@
 $ext = substr($tarball['PEAR'], $dot + 1);
 
 include_once 'Archive/Tar.php';
+
 $tar = &new Archive_Tar($tarball['PEAR'], $have_gzip);
 if (!$tar->extractModify($ptmp, $pkg)) {
     bail("failed!\n");
@@ -782,10 +786,12 @@
 $registry = new PEAR_Registry($php_dir);
 PEAR_Command::setFrontendType('CLI');
 $install = &PEAR_Command::factory('install', $config);
+
 $install_options = array(
     'nodeps' => true,
     'force' => true,
-    );
+);
+
 foreach ($tarball as $pkg => $src) {
     $options = $install_options;
     if ($registry->packageExists($pkg)) {

-- 
PEAR CVS Mailing List (http://pear.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php