cvs: pearweb /public_html go-pear

tias            Thu Jul 12 17:07:33 2007 UTC

  Modified files:              
    /pearweb/public_html        go-pear 
  Log:
  Use pear_frontend_web beta now,
  + patch that makes patch resolution better
  
  
http://cvs.php.net/viewvc.cgi/pearweb/public_html/go-pear?r1=1.107&r2=1.108&diff_format=u
Index: pearweb/public_html/go-pear
diff -u pearweb/public_html/go-pear:1.107 pearweb/public_html/go-pear:1.108
--- pearweb/public_html/go-pear:1.107   Fri Jun 29 10:27:04 2007
+++ pearweb/public_html/go-pear Thu Jul 12 17:07:33 2007
@@ -18,7 +18,7 @@
 # |          Pierre-Alain Joye <pierre@xxxxxxx>                          |
 # |          Greg Beaver <cellog@xxxxxxx>                                |
 # +----------------------------------------------------------------------+
-# $Id: go-pear,v 1.107 2007/06/29 10:27:04 tias Exp $
+# $Id: go-pear,v 1.108 2007/07/12 17:07:33 tias Exp $
 #
 # Automatically download all the files needed to run the "pear" command
 # (the PEAR package installer).  Requires PHP 4.3.0 or newer.
@@ -157,7 +157,7 @@
 if (WEBINSTALLER) {
     $installer_packages[] = 'HTML_Template_IT-stable';
     $installer_packages[] = 'Net_UserAgent_Detect-stable';
-    $installer_packages[] = 'PEAR_Frontend_Web-alpha';
+    $installer_packages[] = 'PEAR_Frontend_Web-beta';
 }
 
 $pfc_packages = array(
@@ -875,7 +875,7 @@
     copy ( $doc_dir.DIRECTORY_SEPARATOR.
             'PEAR_Frontend_Web'.DIRECTORY_SEPARATOR.
             'docs'.DIRECTORY_SEPARATOR.
-            'example.php',
+            'index.php.txt',
             $webfrontend_file
         );
     if ($_GET['step'] == 'install-progress') {
@@ -985,6 +985,7 @@
     }
     if (!$fp) {
         bail("download of $url failed: $errstr ($errno)\n");
+        // If valid URL but error, no CURL extentions installed
     }
     if (empty($proxy)) {
         $path = $tmp['path'];
@@ -1195,7 +1196,7 @@
         }
 
         /* try it really, is_writable is buggy with openbasedir */
-        $fh = fopen(realpath($default) . "/test","wb");
+        $fh = @fopen(realpath($default) . "/test","wb");
         if ($fh) {
             $ptmp = $default;
             return true;
@@ -1460,7 +1461,7 @@
         color: #006600;
     }
     .red {
-        color: #006600;
+        color: #ff0000;
     }
 
     span.headline {
@@ -1989,7 +1990,7 @@
 function displayHTMLInstallationSummary($data = '')
 {
     $next     = NULL;
-    $file   = $GLOBALS['webfrontend_file'];
+    $file     = $GLOBALS['webfrontend_file'];
     $doc_root = strip_magic_quotes($_SERVER['DOCUMENT_ROOT']);
     $file_dir = dirname(__FILE__);
     if ( WINDOWS ) {
@@ -2000,8 +2001,16 @@
 
     if ($doc_root && substr($file, 0, strlen($doc_root)) == $doc_root) {
         $next = substr($file, strlen($doc_root));
-    } elseif ($file_dir && substr($file, 0, strlen($file_dir)) == $file_dir) {
+        // need leading / (file - docroot = path from docroot)
+        if (substr($next, 0, 1) != '/') {
+            $next = '/'.$next;
+        }
+    } else if ($file_dir && substr($file, 0, strlen($file_dir)) == $file_dir) {
         $next = substr($file, strlen($file_dir));
+        // strip leading / (file - file_dir = path from go-pear file)
+        if (substr($next, 0, 1) == '/') {
+            $next = substr($next, 1, strlen($next));
+        }
     }
 
     if ($data) {

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