[arch-commits] CVS update of extra/devel/php (php.install)

[Pierre Schmitz]

    Date: Friday, September 28, 2007 @ 04:28:32
  Author: pierre
    Path: /home/cvs-extra/extra/devel/php

Modified: php.install (1.10 -> 1.11)

be nice to [testing] users and update php.ini to fix bug #8141.


-------------+
 php.install |   16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)


Index: extra/devel/php/php.install
diff -u extra/devel/php/php.install:1.10 extra/devel/php/php.install:1.11
--- extra/devel/php/php.install:1.10	Thu Sep 27 05:02:09 2007
+++ extra/devel/php/php.install	Fri Sep 28 04:28:32 2007
@@ -34,7 +34,8 @@
 
 pre_upgrade() {
   # we moved php.ini from /etc/ to /etc/php
-  # lets save the old file before pacman deletes it
+  # lets save the old file before pacman deletes it.
+  # can be removed later
   if [ -f /etc/php.ini ] && [ $(vercmp '5.2.4-2' $2) -ge 0 ];then
     echo 'Backing up old php.ini...'
     mv /etc/php.ini /etc/php.ini.pacsave.tmp
@@ -51,12 +52,13 @@
     configuration which can be found at php.ini.pacnew.
     '
   # if we upgraded from an installation with old config layout, move the old
-  # php.ini to the right place and inform the user about the changes
+  # php.ini to the right place and inform the user about the changes.
+  # can be removed later
   if [ -f /etc/php.ini.pacsave.tmp ] && [ $(vercmp '5.2.4-2' $2) -ge 0 ]; then
-    echo 'Restore old php.ini...'
+    echo 'Restoring old php.ini...'
     mv /etc/php/php.ini /etc/php/php.ini.pacnew
     mv /etc/php.ini.pacsave.tmp /etc/php/php.ini
-    echo 'Update extension dir...'
+    echo 'Updating extension dir...'
     sed -i -e 's#extension_dir = "/usr/lib/php/extensions/php/"#extension_dir = "/usr/lib/php/20060613/"#g' /etc/php/php.ini
     echo '
     ==> Location of php.ini has changed
@@ -73,6 +75,12 @@
     scans that directory for any ini files.
     '
   fi
+  # be nice to [testing] users and update php.ini to fix bug #8141.
+  # can be removed later
+  if [ $(vercmp '5.2.4-3' $2) -eq 0 ]; then
+    echo 'Updating extension dir...'
+    sed -i -e 's#extension_dir = "/usr/lib/php/extensions/"#extension_dir = "/usr/lib/php/20060613/"#g' /etc/php/php.ini
+  fi
 }
 
 op=$1