X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Ffunctions.sh;h=6f162903670f01bc9b8faa09874165cf36e8b0e2;hb=c7c7fc7ed803a12aedbe89595e24e067e4645a6a;hp=f1b284ae73e49e43de5e5e3d585ca99d0cf9b908;hpb=c699ddf28809a37e5133e0f66d60e3b11ae5bda7;p=carnet-upgrade.git

diff --git a/src/functions.sh b/src/functions.sh
index f1b284a..6f16290 100644
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -588,7 +588,7 @@ reboot_required () {
 }
 
 upgrade () {
-  local i to_install packages
+  local packages
   case "$1" in
     first)
       packages="$packages_first"
@@ -600,16 +600,7 @@ upgrade () {
     return 1
   esac
 
-  for i in $(echo $packages)
-  do
-    pkg $i && to_install="$to_install $i"
-  done
-
-  if [ -n "$to_install" ];then
-    eval pkgadd $to_install
-  else
-    return 0
-  fi
+  pkgadd_if_installed $packages
 }
 
 # funkcija utrpa ispravan sources.list
@@ -904,49 +895,6 @@ restore_configs () {
      restore_file /etc/monit/monitrc $config_new
      rm -f $config_new
   fi
-
-#  restore_config login 1:4.0.18.1 /etc/pam.d/login
-#  restore_config mysql-server 5.0.3 /etc/init.d/mysql \
-#                                    /etc/logrotate.d/mysql-server \
-#                                    /etc/mysql/my.cnf
-#  restore_config ntpdate 1:4.2.2 /etc/default/ntpdate
-#  restore_config oidentd 2.0.8 /etc/default/oidentd
-#  restore_config slapd 2.3.30 /etc/default/slapd /etc/init.d/slapd
-#  restore_config squirrelmail 2:1.4.9a /etc/squirrelmail/apache.conf
-#  restore_config vsftpd 2.0.5 /etc/vsftpd.conf
-#  restore_config xinetd 1:2.3.14 /etc/xinetd.conf
-#
-#  # orphaned config file - no owner
-#  if pkg logcheck-database lt 1.2.54; then
-#      rm -vf /etc/logcheck/ignore.d.server/imap
-#  fi
-#
-#  # aide switched to ucf, move old configs aside
-#  if pkg aide lt 0.13.1; then
-#      for file in /etc/aide/aide.conf \
-#                  /etc/cron.daily/aide \
-#                  /etc/default/aide;
-#      do
-#          if [ ! -e "$file.$backup_ext" ]; then
-#              mv -v "$file" "$file.$backup_ext"
-#          fi
-#
-#          rm -vf "$file"
-#      done
-#  fi
-#
-#  # register cn changes in ucf managed files
-#  for config in /etc/apache/modules.conf \
-#                /etc/clamav/clamd.conf \
-#                /etc/clamav/freshclam.conf
-#  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
-#  done
 }
 
 # temporary disable listchanges packages to reduce clutter during upgrade
@@ -976,7 +924,7 @@ apt_listchanges () {
 # make a silent installation of carnet and srce keyrings
 install_keyrings () {
   pkgadd carnet-keyring srce-keyring debian-archive-keyring
-  pkgadd dpkg apt debconf python-apt
+  pkgadd_if_installed dpkg apt debconf python-apt dpkg-dev
 
   dpkg-reconfigure carnet-keyring srce-keyring debian-archive-keyring
   apt_update
@@ -1040,30 +988,39 @@ disable_monit () {
   fi
 }
 
+# check which of the given packages are installed
+grep_installed () {
+  local package installed
+
+  for package in $*; do
+    if pkg $package; then
+      installed="$installed $package"
+    fi
+  done
+
+  echo $installed
+}
+
+# only upgrade packages if they are already installed
+pkgadd_if_installed () {
+  local packages
+
+  packages=$( grep_installed $* )
+
+  if [ "$packages" ]; then
+    eval pkgadd $packages
+  fi
+}
+
 # make a silent upgrade to new libc6
 upgrade_libc () {
-  DEBIAN_FRONTEND=noninteractive pkgadd libc6 tzdata
+  DEBIAN_FRONTEND=noninteractive pkgadd_if_installed libc6 libc6-dev tzdata
 }
 
 # upgrade apache2/php5 to lenny
 upgrade_apache2 () {
-  local package packages
-
-  for package in \
-      libapache2-mod-php5 \
-      php5-cli \
-      php5-cn \
-      apache2-cn \
-      php5-odbc \
-      php5-suhosin \
-      php-suhosin-cn
-  do
-      if pkg $package; then
-          packages="$packages $package"
-      fi
-  done
-
-  eval pkgadd $packages
+  pkgadd_if_installed libapache2-mod-php5 php5-cli php5-cn apache2-cn \
+    php5-odbc php5-suhosin php-suhosin-cn
 }
 
 upgrade_amavis () {