cvs: pearweb /public_html go-pear

cellog Fri May 25 20:29:55 2007 UTC

Modified files:
/pearweb/public_html go-pear
Log:
fix Bug #10660 go-pear won't install with PHP 4.4.4 [cellog/tias]

http://cvs.php.net/viewvc.cgi/pearwe...&diff_format=u
Index: pearweb/public_html/go-pear
diff -u pearweb/public_html/go-pear:1.104 pearweb/public_html/go-pear:1.105
--- pearweb/public_html/go-pear:1.104 Sat Mar 17 21:43:08 2007
+++ pearweb/public_html/go-pear Fri May 25 20:29:54 2007
@@ -18,7 +18,7 @@
# | Pierre-Alain Joye <pierre@php.net> |
# | Greg Beaver <cellog@php.net> |
# +----------------------------------------------------------------------+
-# $Id: go-pear,v 1.104 2007/03/17 21:43:08 cellog Exp $
+# $Id: go-pear,v 1.105 2007/05/25 20:29:54 cellog Exp $
#
# Automatically download all the files needed to run the "pear" command
# (the PEAR package installer). Requires PHP 4.1.0 or newer.
@@ -491,7 +491,7 @@
}

if (!empty($tmp) ) {
- $$var = $tmp;
+ $$var = parse_dirname($tmp);
}
} elseif ($tmp == 'all') {
foreach ($config_vars as $n => $var) {
@@ -511,6 +511,7 @@
$var2 = $config_vars[$m];
$$var = str_replace('$'.$var2, $$var2, $$var);
}
+ $$var = parse_dirname($$var);
}


@@ -969,6 +970,44 @@
win32CreateRegEnv();
}
// Set of functions following
+/**
+ * Parse the given dirname
+ * eg. expands '~' etc
+ *
+ * @param string $dir directory, from input
+ * @return string parsed directory
+ */
+function parse_dirname($dir)
+{
+ if (!isset($_ENV['HOME'])) {
+ if (strpos($dir, '~') === 0) {
+ if (WEBINSTALLER) {
+ die('<p><em>Can\'t use the \'~\' symbol for homedir substitution, write the directory out in full.</em></p>');
+ } else {
+ die('Can\'t use the \'~\' symbol for homedir substitution, write the directory out in full.');
+ }
+ }
+ return $dir;
+ }
+
+ $home_root = $_ENV['HOME'];
+ // first strip last slash, if available
+ if (substr($home_root, -1) == DIRECTORY_SEPARATOR) {
+ $home_root = substr($home_root, 0, -1);
+ }
+ if (strpos($dir, '~/') === 0) {
+ // eg ~/ = /home/tias/
+ $dir = substr_replace($dir, $home_root, 0, 1);
+ } elseif (strpos($dir, '~') === 0) {
+ // eg ~tias/ = /home/tias/
+ // then delete user-dir
+ $home_root = dirname($home_root) . DIRECTORY_SEPARATOR;
+ $dir = substr_replace($dir, $home_root, 0, 1);
+ }
+
+ return $dir;
+}
+

// {{{ download_url()