Updated bloat handling and list.

[carnet-upgrade.git] / src / functions.sh

diff --git a/src/functions.sh b/src/functions.sh
index 168bc91..f68c54b 100644 (file)
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -129,26 +129,27 @@ dist_upgrade () {
 }
 
 remove_bloat() {
-  local to_remove add_this i j n text to_show cmd tmpfile installed
+  local to_remove add_this i j text to_show cmd tmpfile installed
   local update_selections pkgs_to_deselect oldifs
   text="$msg_remove_bloat"
 
   [ "$DEBUG" ] && set -x
-  n=0
+  pkglist=$(mktemp /var/lib/carnet-upgrade/pkglist.XXXXXX)
+  COLUMNS=200 dpkg -l | awk '$1 ~ /^.i/ { print $2 }' > $pkglist
   for i in $(echo "$bloats" | sed 's/          */      /g'| awk -F'    ' '{print $2}')
   do
-    if pkg $i; then
+    if grep -q "^$i$" $pkglist; then
       installed="$installed $i"
       add_this="$(echo "$bloats" | egrep "     .*\b${i}\b" | sed 's/           */      /g'| awk -F'    ' '{print $1}')"
       if ! echo "$to_show" | grep -q "$add_this"; then
         to_show="$to_show \"$add_this\" \"\" on"
-        n=$(($n+1))
       fi
     fi
   done
+  [ "$DEBUG" ] || rm -f $pkglist
   [ -z "$to_show" ] && return 0
   tmpfile=$(mktemp /var/lib/carnet-upgrade/dialog-tmp.XXXXXX)
-  cmd="dialog --nocancel --backtitle \""$title"\" --checklist \""$text"\" 20 75 $n $to_show"
+  cmd="dialog --nocancel --backtitle \""$title"\" --checklist \""$text"\" 20 75 8 $to_show"
   [ "$DEBUG" ] && set +x
     eval $cmd 2> $tmpfile
   [ "$DEBUG" ] && set -x
@@ -280,10 +281,9 @@ Nakon toga ponovno pozovite ovu skriptu."
 # if apache is installed make sure it's version 2
 check_apache_version () {
 
-  if ! pkg apache2-cn && pkg apache-cn; then
+  if pkg apache-cn && ! pkg apache2-cn; then
     notice "
-Prije prelaska na Debian Etch potrebno je napraviti nadogradnju sa apache 1.3
-na apache 2.0.
+Prije prelaska na Debian Etch potrebno je napraviti nadogradnju sa apache 1.3 na apache 2.0.
 
 Pokrenite:
   'apt-get install apache2-cn'
@@ -523,6 +523,20 @@ restore_configs () {
           rm -vf "$file"
       done
   fi
+
+  # register cn changes in apache files
+  for config in /etc/php4/cgi/php.ini \
+                /etc/php4/cli/php.ini \
+                /etc/php4/apache/php.ini \
+                /etc/php4/apache2/php.ini \
+                /etc/apache/modules.conf
+  do 
+      config_backup=$config.$backup_ext
+      if [ -e $config -a ! -e $config_backup ]; then
+          cp -av $config $config_backup
+          ucf $config_backup $config
+      fi
+  done
 }
 
 # temporary disable listchanges packages to reduce clutter during upgrade
@@ -597,20 +611,6 @@ upgrade_apache () {
       eval apt-get --yes remove $delpkg
   fi
 
-  # register cn changes in apache files
-  for config in /etc/php4/cgi/php.ini \
-                /etc/php4/cli/php.ini \
-                /etc/php4/apache/php.ini \
-                /etc/php4/apache2/php.ini \
-                /etc/apache/modules.conf
-  do 
-      config_backup=$config.$backup_ext
-      if [ ! -e $config_backup ]; then
-          cp -av $config $config_backup
-          ucf $config_backup $config
-      fi
-  done
-
   # remove old apache
   pkgrm apache apache-common