* paj's last Windows install fixes

diff --git a/pear/package-PEAR.xml b/pear/package-PEAR.xml
index 4a0de38b3207ffefcc82ec5c238017e34e239cbf..7506e9dcaf98e2f64579fead4d92730a055a2dd1 100644 (file)
--- a/pear/package-PEAR.xml
+++ b/pear/package-PEAR.xml
@@ -31,7 +31,7 @@
     </maintainer>
   </maintainers>
   <release>
-    <version>1.1-dev</version>
+    <version>1.1</version>
     <state>stable</state>
     <date>2003-01-10</date>
     <notes>
@@ -94,17 +94,23 @@ PEAR INSTALLER:
         <file role="php" name="Guess.php"/>
       </dir>
       <dir name="scripts">
-        <file baseinstalldir="/" role="script" install-as="pear" name="pear.in">
+        <file baseinstalldir="/" role="script" install-as="pear" name="pear_unices">
           <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>
+             <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" install-as="pearcmd.php" name="pear.in">
+          <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>
       </dir>
     </filelist>
     <deps>

diff --git a/pear/scripts/pear_unices b/pear/scripts/pear_unices
new file mode 100644 (file)
index 0000000..e4868e8
--- /dev/null
+++ b/pear/scripts/pear_unices
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+# first find which PHP binary to use
+if test "x$PHP_PEAR_PHP_BIN" != "x"; then
+  PHP="$PHP_PEAR_PHP_BIN"
+else
+  if test "@php_bin@" = '@'php_bin'@'; then
+    PHP=php 
+  else
+    PHP="@php_bin@"
+  fi
+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"
+else
+  if test "@php_dir@" = '@'php_dir'@'; then
+    INC=""  
+  else
+    INC="-d include_path=@php_dir@"
+  fi
+fi
+
+exec $PHP -C -q $INC -d output_buffering=1 $0 $@
+<?php
+include "@include_path@/pearcmd.php";
+?>

diff --git a/pear/scripts/pear.in b/pear/scripts/pearcmd.php
similarity index 94%
rename from pear/scripts/pear.in
rename to pear/scripts/pearcmd.php
index 71668ee702b79c85c6f827dcddea35660ec76a68..b3ce3711068aedaa9e098a9ef08a98ed5d91978d 100644 (file)
--- a/pear/scripts/pear.in
+++ b/pear/scripts/pearcmd.php
@@ -1,28 +1,3 @@
-#!/bin/sh
-
-# first find which PHP binary to use
-if test "x$PHP_PEAR_PHP_BIN" != "x"; then
-  PHP="$PHP_PEAR_PHP_BIN"
-else
-  if test "@php_bin@" = '@'php_bin'@'; then
-    PHP=php
-  else
-    PHP="@php_bin@"
-  fi
-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"
-else
-  if test "@php_dir@" = '@'php_dir'@'; then
-    INC=""
-  else
-    INC="-d include_path=@php_dir@"
-  fi
-fi
-
-exec $PHP -C -q $INC -d output_buffering=1 $0 $@
 <?php
 //
 // +----------------------------------------------------------------------+