Fixed postgresql upgrade problems (removed due to dependencies).

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

diff --git a/src/functions.sh b/src/functions.sh
index 22ba7a6..d25ca65 100644 (file)
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -229,8 +229,8 @@ run_actions() {
     check=$(echo "$line" | sed 's/             */      /g'| awk -F'    ' '{print $1}')
     action=$(echo "$line" | sed 's/            */      /g'| awk -F'    ' '{print $2}')
     checkmsg=""
-    [ "$test" != "true" ] && checkmsg="if '$test'"
-    if eval $test; then
+    [ "$check" != "true" ] && checkmsg="if '$check'"
+    if eval $check; then
       log "$(printf 'action %02d' $lineno) starting: '${action}' $checkmsg "
       eval $action
       log "$(printf 'action %02d' $lineno) finished: '${action}' $checkmsg"
@@ -286,7 +286,7 @@ check_apache_version () {
 
   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'
@@ -539,6 +539,7 @@ restore_configs () {
   do 
       config_backup=$config.$backup_ext
       if [ -e $config -a ! -e $config_backup ]; then
+          log "Saving config file $config"
           cp -av $config $config_backup
           ucf $config_backup $config
       fi
@@ -593,38 +594,23 @@ upgrade_libc () {
   DEBIAN_FRONTEND=noninteractive pkgadd libc6
 }
 
-# upgrade apache -> apache2
-upgrade_apache () {
-  local delpkg p
+# upgrade apache2 to etch
+upgrade_apache2 () {
+  local package
 
-  # bugfix for apache2-cn postinst
-  mkdir -p /etc/apache2
-  touch /etc/apache2/httpd.conf
-
-  # temporary remove packages conflicting with apache2
-  delpkg=""
-  for p in aosi-aai aosi-www-aai \
-           php4-cn php4-odbc php4-xslt \
-           squirrelmail-cn; do
-
-     # remember installed packages
-     if pkg $p; then
-         delpkg="$delpkg $p"
-     fi
+  for package in \
+      libapache2-mod-php4 \
+      php4-cli \
+      php4-cgi \
+      php4-cn \
+      apache2-cn
+  do
+      if pkg $package; then
+          pkgadd $package
+      fi
   done
 
-  # remove (but not purge) problematic packages
-  if [ "$delpkg" ]; then
-      eval apt-get --yes remove $delpkg
-  fi
-
-  # remove old apache
-  pkgrm apache apache-common
-
-  # install new packages
-  eval pkgadd apache2-cn apache2-mpm-prefork \
-              php4-cn libapache2-mod-php4 \
-              $delpkg
+  pkgrm php-suhosin-cn # causes removal of applications on dist-upgrade
 }
 
 upgrade_amavis () {