* rename pear_unices to pear.sh and make it a pure shell script

diff --git a/pear/package-PEAR.xml b/pear/package-PEAR.xml
index 97577d5dd23af35179e37cd259247c1608a97162..8db6d462b079c8822000d3c13f25988f41285999 100644 (file)
--- 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
similarity index 59%
rename from pear/scripts/pear_unices
rename to pear/scripts/pear.sh
index e4868e80343f283066ee47e763144ae040d42782..839a0122d3da3d16074963f6215bb62427d04a0b 100644 (file)
--- 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 $@