fix spaces in paths for an installation into a directory with spaces

diff --git a/pear/scripts/pear.bat b/pear/scripts/pear.bat
index cfc1609a64955d3f1e0d24faf71718554a30d338..2afcb0b50f885f4987467b8cf60f44a64c29c6e4 100755 (executable)
--- a/pear/scripts/pear.bat
+++ b/pear/scripts/pear.bat
@@ -1,69 +1,69 @@
-@ECHO OFF\r
-\r
-REM ----------------------------------------------------------------------\r
-REM PHP version 4.0\r
-REM ----------------------------------------------------------------------\r
-REM Copyright (c) 1997-2002 The PHP Group\r
-REM ----------------------------------------------------------------------\r
-REM  This source file is subject to version 3.0 of the PHP license, \r
-REM  that is bundled with this package in the file LICENSE, and is\r
-REM  available at through the world-wide-web at\r
-REM  http://www.php.net/license/3_0.txt. \r
-REM  If you did not receive a copy of the PHP license and are unable to\r
-REM  obtain it through the world-wide-web, please send a note to\r
-REM  license@php.net so we can mail you a copy immediately.\r
-REM ----------------------------------------------------------------------\r
-REM  Authors:     Alexander Merz (alexmerz@php.net)\r
-REM ----------------------------------------------------------------------\r
-REM\r
-REM  $Id: pear.bat,v 1.14 2003/04/03 23:21:30 ssb Exp $\r
-\r
-REM change this lines to match the paths of your system\r
-REM -------------------\r
-\r
-@ECHO OFF\r
-:: Check PEAR global ENV, set them if they do not exist\r
-IF "%PHP_PEAR_INSTALL_DIR%"=="" SET PHP_PEAR_INSTALL_DIR=@include_path@\r
-IF "%PHP_PEAR_BIN_DIR%"=="" SET PHP_PEAR_BIN_DIR=@bin_dir@\r
-IF "%PHP_PEAR_PHP_BIN%"=="" SET  PHP_PEAR_PHP_BIN=@php_bin@\r
- \r
-:: Check Folders and files\r
-IF NOT EXIST %PHP_PEAR_INSTALL_DIR% GOTO PEAR_INSTALL_ERROR\r
-IF NOT EXIST %PHP_PEAR_INSTALL_DIR%\pearcmd.php GOTO PEAR_INSTALL_ERROR2\r
-IF NOT EXIST %PHP_PEAR_BIN_DIR% GOTO PEAR_BIN_ERROR\r
-IF NOT EXIST %PHP_PEAR_PHP_BIN% GOTO PEAR_PHPBIN_ERROR\r
-:: launch pearcmd\r
-GOTO RUN\r
-:PEAR_INSTALL_ERROR\r
-ECHO PHP_PEAR_INSTALL_DIR is not set correctly.\r
-ECHO Please fix it using your environment variable or modify\r
-ECHO the default value in pear.bat\r
-ECHO The current value is:\r
-ECHO %PHP_PEAR_INSTALL_DIR%\r
-GOTO END\r
-:PEAR_INSTALL_ERROR2\r
-ECHO PHP_PEAR_INSTALL_DIR is not set correctly.\r
-ECHO pearcmd.php could not be found there.\r
-ECHO Please fix it using your environment variable or modify\r
-ECHO the default value in pear.bat\r
-ECHO The current value is:\r
-ECHO %PHP_PEAR_INSTALL_DIR%\r
-GOTO END\r
-:PEAR_BIN_ERROR\r
-ECHO PHP_PEAR_BIN_DIR is not set correctly.\r
-ECHO Please fix it using your environment variable or modify\r
-ECHO the default value in pear.bat\r
-ECHO The current value is:\r
-ECHO %PHP_PEAR_BIN_DIR%\r
-GOTO END\r
-:PEAR_PHPBIN_ERROR\r
-ECHO PHP_PEAR_PHP_BIN is not set correctly.\r
-ECHO Please fix it using your environment variable or modify\r
-ECHO the default value in pear.bat\r
-ECHO The current value is:\r
-ECHO %PHP_PEAR_PHP_BIN%\r
-GOTO END\r
-:RUN\r
-%PHP_PEAR_PHP_BIN% -C -d output_buffering=1 -d include_path=%PHP_PEAR_INSTALL_DIR% -f %PHP_PEAR_INSTALL_DIR%\pearcmd.php -- %1 %2 %3 %4 %5 %6 %7 %8 %9\r
-:END\r
-@ECHO ON\r
+@ECHO OFF
+
+REM ----------------------------------------------------------------------
+REM PHP version 4.0
+REM ----------------------------------------------------------------------
+REM Copyright (c) 1997-2002 The PHP Group
+REM ----------------------------------------------------------------------
+REM  This source file is subject to version 3.0 of the PHP license, 
+REM  that is bundled with this package in the file LICENSE, and is
+REM  available at through the world-wide-web at
+REM  http://www.php.net/license/3_0.txt. 
+REM  If you did not receive a copy of the PHP license and are unable to
+REM  obtain it through the world-wide-web, please send a note to
+REM  license@php.net so we can mail you a copy immediately.
+REM ----------------------------------------------------------------------
+REM  Authors:     Alexander Merz (alexmerz@php.net)
+REM ----------------------------------------------------------------------
+REM
+REM  $Id: pear.bat,v 1.15 2003/06/10 20:03:44 imajes Exp $
+
+REM change this lines to match the paths of your system
+REM -------------------
+
+@ECHO OFF
+:: Check PEAR global ENV, set them if they do not exist
+IF "%PHP_PEAR_INSTALL_DIR%"=="" SET PHP_PEAR_INSTALL_DIR="@include_path@"
+IF "%PHP_PEAR_BIN_DIR%"=="" SET PHP_PEAR_BIN_DIR="@bin_dir@"
+IF "%PHP_PEAR_PHP_BIN%"=="" SET  PHP_PEAR_PHP_BIN="@php_bin@"
+ 
+:: Check Folders and files
+IF NOT EXIST "%PHP_PEAR_INSTALL_DIR%" GOTO PEAR_INSTALL_ERROR
+IF NOT EXIST "%PHP_PEAR_INSTALL_DIR%\pearcmd.php" GOTO PEAR_INSTALL_ERROR2
+IF NOT EXIST "%PHP_PEAR_BIN_DIR%" GOTO PEAR_BIN_ERROR
+IF NOT EXIST "%PHP_PEAR_PHP_BIN%" GOTO PEAR_PHPBIN_ERROR
+:: launch pearcmd
+GOTO RUN
+:PEAR_INSTALL_ERROR
+ECHO PHP_PEAR_INSTALL_DIR is not set correctly.
+ECHO Please fix it using your environment variable or modify
+ECHO the default value in pear.bat
+ECHO The current value is:
+ECHO %PHP_PEAR_INSTALL_DIR%
+GOTO END
+:PEAR_INSTALL_ERROR2
+ECHO PHP_PEAR_INSTALL_DIR is not set correctly.
+ECHO pearcmd.php could not be found there.
+ECHO Please fix it using your environment variable or modify
+ECHO the default value in pear.bat
+ECHO The current value is:
+ECHO %PHP_PEAR_INSTALL_DIR%
+GOTO END
+:PEAR_BIN_ERROR
+ECHO PHP_PEAR_BIN_DIR is not set correctly.
+ECHO Please fix it using your environment variable or modify
+ECHO the default value in pear.bat
+ECHO The current value is:
+ECHO %PHP_PEAR_BIN_DIR%
+GOTO END
+:PEAR_PHPBIN_ERROR
+ECHO PHP_PEAR_PHP_BIN is not set correctly.
+ECHO Please fix it using your environment variable or modify
+ECHO the default value in pear.bat
+ECHO The current value is:
+ECHO %PHP_PEAR_PHP_BIN%
+GOTO END
+:RUN
+"%PHP_PEAR_PHP_BIN%" -C -d output_buffering=1 -d include_path="%PHP_PEAR_INSTALL_DIR%" -f "%PHP_PEAR_INSTALL_DIR%\pearcmd.php" -- %1 %2 %3 %4 %5 %6 %7 %8 %9
+:END
+@ECHO ON