X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=debian%2Fpostinst;h=14b691b10a2194b1747927501fd4a406d1797b0c;hb=8c965cb57aecb3955fc9b22d76449cc2244a4dbb;hp=8229fc3284815743567f3aad87b0e7fd287a25f2;hpb=6cfff3db2e964ff7cc54d193db5675215aef2353;p=php5-cn.git

diff --git a/debian/postinst b/debian/postinst
index 8229fc3..14b691b 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -137,7 +137,9 @@ for php5ext in $EXTENSIONS; do
 
         	if [ -f "$ini_file" ]; then
 
-			cp_echo "CN: Removing $php5ext extension from file $ini_file"
+			if egrep -q "$php5ext_re" "$ini_file"; then
+				cp_echo "CN: Removing $php5ext extension from file $ini_file"
+			fi
 
 			cp_check_and_sed "$php5ext_re" \
 				"/$php5ext_re/d" \
@@ -256,10 +258,7 @@ done
 
 # Compare active PHP5 extensions with PHP4 ones, if PHP4 configuration still exists.
 #
-db_fget php5-cn/extensions seen
-if [ "$RET" != "true" ]; then
-
-    if [ -d "${PHP4DIR}" ] && [ -f "${PHP4DIR}/apache2/php.ini" ]; then
+if [ -d "${PHP4DIR}" ] && [ -f "${PHP4DIR}/apache2/php.ini" ]; then
 
         phpext_re='^[[:space:]]*extension[[:space:]]*=[[:space:]]*["]{0,1}(.*)\.so["]{0,1}'
 
@@ -281,18 +280,18 @@ if [ "$RET" != "true" ]; then
         for ext in $php4_ext; do
             if [ "$(echo $php5_ext | egrep $ext)" = "" ]; then
                 php5_ext_mis="\n${ext}${php5_ext_mis}"
-            if
+            fi
         done
 
         # Some PHP5 extensions are not active.
         if [ -n "$php5_ext_mis" ]; then
             db_fset php5-cn/extensions seen false
             db_title php5-cn - konfiguracija
-            db_subst php5-cn/extensions php5_extensions "${php5_ext_mis}"
+            db_capb escape
+            db_subst php5-cn/extensions php5_extensions "${php5_ext_mis#*\n}"
             db_input critical php5-cn/extensions || true
             db_go || true
         fi
-    fi
 fi
 
 
@@ -309,9 +308,9 @@ if [ $need_restart -eq 1 ]; then
 		# Restart Apache2 web server.
 		if [ -x "/etc/init.d/apache2" ]; then
 	            if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-			invoke-rc.d apache2 force-reload || true
+			invoke-rc.d apache2 restart || true
 		    else
-			/etc/init.d/apache2 force-reload || true
+			/etc/init.d/apache2 restart || true
 	    	    fi
 		fi
 	else