cvs: pearweb /public_html go-pear
| From: | Pierre-Alain Joye | Date: | Fri, 16 Jun 2006 15:33:55 +0000 |
| Subject: | cvs: pearweb /public_html go-pear | ||
| Groups: | php.pear.cvs php.pear.core | ||
| Request: | Send a blank email to pear-cvs+get-40767@lists.php.net to get a copy of this message | ||
pajoye Fri Jun 16 15:33:55 2006 UTC
Modified files:
/pearweb/public_html go-pear
Log:
- fix temp_dir detection (it was left empty)
http://cvs.php.net/viewcvs.cgi/pearweb/public_html/go-pear?r1=1.95&r2=1.96&diff_format=u
Index: pearweb/public_html/go-pear
diff -u pearweb/public_html/go-pear:1.95 pearweb/public_html/go-pear:1.96
--- pearweb/public_html/go-pear:1.95 Fri Jun 16 14:46:23 2006
+++ pearweb/public_html/go-pear Fri Jun 16 15:33:55 2006
@@ -18,7 +18,7 @@
# | Pierre-Alain Joye <pierre@php.net> |
# | Greg Beaver <cellog@php.net> |
# +----------------------------------------------------------------------+
-# $Id: go-pear,v 1.95 2006/06/16 14:46:23 pajoye Exp $
+# $Id: go-pear,v 1.96 2006/06/16 15:33:55 pajoye Exp $
#
# Automatically download all the files needed to run the "pear" command
# (the PEAR package installer). Requires PHP 4.1.0 or newer.
@@ -92,7 +92,7 @@
echo '</pre>';
} else {
print_r($var);
- print_r($var);
+ echo "\n";
}
}
@@ -1140,6 +1140,7 @@
if (@is_dir($dir)) {
return true;
}
+
$parent = dirname($dir);
$ok = true;
if (!@is_dir($parent) && $parent != $dir) {
@@ -1148,7 +1149,7 @@
if ($ok) {
$ok = @mkdir($dir, $mode);
if (!$ok) {
- print "mkdir failed: $dir\n";
+ print "mkdir failed: <$dir>\n";
}
}
return $ok;
@@ -1277,8 +1278,11 @@
$_ENV = array();
}
$_ENV['TMPDIR'] = $_ENV['TEMP'] = $prefix.'/tmp';
+ } else {
+ $_temp = tempnam($_temp.'/tmp', 'gope');
}
$temp_dir = $ptmp = $_temp;
+ return true;
}
// }}}
@@ -1299,7 +1303,7 @@
// {{{ detect_install_dirs()
function detect_install_dirs($_prefix = null) {
- global $prefix, $bin_dir, $php_dir, $php_bin, $doc_dir, $data_dir, $test_dir;
+ global $temp_dir, $prefix, $bin_dir, $php_dir, $php_bin, $doc_dir, $data_dir, $test_dir;
if (WINDOWS) {
if ($_prefix === null) {
$prefix = getcwd();