* use PHP_PEAR_* environment variables (paj)

diff --git a/pear/scripts/pear.bat b/pear/scripts/pear.bat
index 7d4d4722e181e5f939c7d6a23efdc34daddf1def..08aca95548a043ee9da6ae1aede8dfb78dd7ed24 100755 (executable)
--- a/pear/scripts/pear.bat
+++ b/pear/scripts/pear.bat
@@ -16,14 +16,54 @@ REM ----------------------------------------------------------------------
 REM  Authors:     Alexander Merz (alexmerz@php.net)\r
 REM ----------------------------------------------------------------------\r
 REM\r
-REM  $Id: pear.bat,v 1.12 2003/01/03 00:17:41 phanto Exp $\r
+REM  $Id: pear.bat,v 1.13 2003/03/25 14:34:02 mj Exp $\r
 \r
 REM change this lines to match the paths of your system\r
 REM -------------------\r
 \r
-set PHP_BIN=@php_bin@\r
-set BIN_DIR=@bin_dir@\r
-set PEAR_PATH=@include_path@\r
-\r
-%PHP_BIN% -C -d output_buffering=1 -d include_path=%PEAR_PATH% -f %BIN_DIR%\pear -- %1 %2 %3 %4 %5 %6 %7 %8 %9\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