diff options
| author | Stig Bakken <ssb@php.net> | 2003-04-04 00:11:00 +0000 |
|---|---|---|
| committer | Stig Bakken <ssb@php.net> | 2003-04-04 00:11:00 +0000 |
| commit | 3ba4fa63301f60912ebf547bf2900cfd397cdd59 (patch) | |
| tree | 3ca16d1d81ca45c8d3b2dc328cc131d6d5477b27 | |
| parent | 74868f3a453842d08ae232fe3d58689b19d72296 (diff) | |
| download | php-git-3ba4fa63301f60912ebf547bf2900cfd397cdd59.tar.gz | |
* rename pear_unices to pear.sh and make it a pure shell script
| -rw-r--r-- | pear/package-PEAR.xml | 10 | ||||
| -rw-r--r-- | pear/scripts/pear.sh (renamed from pear/scripts/pear_unices) | 14 |
2 files changed, 12 insertions, 12 deletions
diff --git a/pear/package-PEAR.xml b/pear/package-PEAR.xml index 97577d5dd2..8db6d462b0 100644 --- a/pear/package-PEAR.xml +++ b/pear/package-PEAR.xml @@ -94,16 +94,16 @@ PEAR INSTALLER: <file role="php" name="Guess.php"/> </dir> <dir name="scripts"> - <file baseinstalldir="/" role="script" install-as="pear" name="pear_unices"> + <file baseinstalldir="/" role="script" install-as="pear" name="pear.sh"> <replace from="@php_bin@" to="php_bin" type="pear-config"/> <replace from="@php_dir@" to="php_dir" type="pear-config"/> <replace from="@pear_version@" to="version" type="package-info"/> <replace from="@include_path@" to="php_dir" type="pear-config"/> </file> - <file baseinstalldir="/" role="script" platform="windows" install-as="pear.bat" name="pear.bat"> - <replace from="@bin_dir@" to="bin_dir" type="pear-config"/> - <replace from="@php_bin@" to="php_bin" type="pear-config"/> - <replace from="@include_path@" to="php_dir" type="pear-config"/> + <file baseinstalldir="/" role="script" platform="windows" name="pear.bat"> + <replace from="@bin_dir@" to="bin_dir" type="pear-config"/> + <replace from="@php_bin@" to="php_bin" type="pear-config"/> + <replace from="@include_path@" to="php_dir" type="pear-config"/> </file> <file baseinstalldir="/" role="php" name="pearcmd.php"> <replace from="@php_bin@" to="php_bin" type="pear-config"/> diff --git a/pear/scripts/pear_unices b/pear/scripts/pear.sh index e4868e8034..839a0122d3 100644 --- a/pear/scripts/pear_unices +++ b/pear/scripts/pear.sh @@ -13,16 +13,16 @@ fi # then look for the right pear include dir if test "x$PHP_PEAR_INSTALL_DIR" != "x"; then - INC="-d include_path=$PHP_PEAR_INSTALL_DIR" + INCDIR=$PHP_PEAR_INSTALL_DIR + INCARG="-d include_path=$PHP_PEAR_INSTALL_DIR" else if test "@php_dir@" = '@'php_dir'@'; then - INC="" + INCDIR=`dirname $0`/.. + INCARG="" else - INC="-d include_path=@php_dir@" + INCDIR="@php_dir@" + INCARG="-d include_path=@php_dir@" fi fi -exec $PHP -C -q $INC -d output_buffering=1 $0 $@ -<?php -include "@include_path@/pearcmd.php"; -?> +exec $PHP -C -q $INCARG -d output_buffering=1 $INCDIR/pearcmd.php $@ |