Skip to content

Commit 3ba4fa6

Browse files
committed
* rename pear_unices to pear.sh and make it a pure shell script
1 parent 74868f3 commit 3ba4fa6

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

pear/package-PEAR.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -94,16 +94,16 @@ PEAR INSTALLER:
9494
<file role="php" name="Guess.php"/>
9595
</dir>
9696
<dir name="scripts">
97-
<file baseinstalldir="/" role="script" install-as="pear" name="pear_unices">
97+
<file baseinstalldir="/" role="script" install-as="pear" name="pear.sh">
9898
<replace from="@php_bin@" to="php_bin" type="pear-config"/>
9999
<replace from="@php_dir@" to="php_dir" type="pear-config"/>
100100
<replace from="@pear_version@" to="version" type="package-info"/>
101101
<replace from="@include_path@" to="php_dir" type="pear-config"/>
102102
</file>
103-
<file baseinstalldir="/" role="script" platform="windows" install-as="pear.bat" name="pear.bat">
104-
<replace from="@bin_dir@" to="bin_dir" type="pear-config"/>
105-
<replace from="@php_bin@" to="php_bin" type="pear-config"/>
106-
<replace from="@include_path@" to="php_dir" type="pear-config"/>
103+
<file baseinstalldir="/" role="script" platform="windows" name="pear.bat">
104+
<replace from="@bin_dir@" to="bin_dir" type="pear-config"/>
105+
<replace from="@php_bin@" to="php_bin" type="pear-config"/>
106+
<replace from="@include_path@" to="php_dir" type="pear-config"/>
107107
</file>
108108
<file baseinstalldir="/" role="php" name="pearcmd.php">
109109
<replace from="@php_bin@" to="php_bin" type="pear-config"/>

pear/scripts/pear_unices renamed to pear/scripts/pear.sh

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@ fi
1313

1414
# then look for the right pear include dir
1515
if test "x$PHP_PEAR_INSTALL_DIR" != "x"; then
16-
INC="-d include_path=$PHP_PEAR_INSTALL_DIR"
16+
INCDIR=$PHP_PEAR_INSTALL_DIR
17+
INCARG="-d include_path=$PHP_PEAR_INSTALL_DIR"
1718
else
1819
if test "@php_dir@" = '@'php_dir'@'; then
19-
INC=""
20+
INCDIR=`dirname $0`/..
21+
INCARG=""
2022
else
21-
INC="-d include_path=@php_dir@"
23+
INCDIR="@php_dir@"
24+
INCARG="-d include_path=@php_dir@"
2225
fi
2326
fi
2427

25-
exec $PHP -C -q $INC -d output_buffering=1 $0 $@
26-
<?php
27-
include "@include_path@/pearcmd.php";
28-
?>
28+
exec $PHP -C -q $INCARG -d output_buffering=1 $INCDIR/pearcmd.php $@

0 commit comments

Comments
 (0)