Update mysql upgrade function

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

diff --git a/src/functions.sh b/src/functions.sh
index 4c98608..61ca1db 100644 (file)
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -367,7 +367,7 @@ check_upgrade () {
 
   if [ "$upgrade" ]; then
     notice "
-Prije prelaska na Debian jessie potrebno je napraviti nadogradnju ovih paketa:
+Prije prelaska na Debian stretch potrebno je napraviti nadogradnju ovih paketa:
   $upgrade
 
 Pokrenite:
@@ -885,19 +885,37 @@ upgrade_amavis () {
     fi
   done
 
+  # workaround for insserv complaining
+  if [ -x /sbin/insserv ]; then
+    if [ -r /etc/init.d/amavis.amavisd-new ]; then
+      /sbin/insserv amavis.amavisd-new
+    fi
+  fi
+
   # install new packages
   pkgadd amavisd-cn amavisd-new
 
+  # workaround for insserv complaining
+  if [ -x /sbin/insserv ]; then
+    if [ -r /etc/init.d/amavis.amavisd-new ]; then
+      /sbin/insserv amavis.amavisd-new
+    fi
+  fi
+
   # start new packages
-  /etc/init.d/amavisd-cn restart
+  ### By zelja, nema vise amavisd-cn, vjerujemo systemd-u
+  ### /etc/init.d/amavisd-cn restart
+  /etc/init.d/amavis restart
 }
 
-# handle mysql 5.0 to 5.1 upgrade
+# handle mysql upgrade
 upgrade_mysql () {
-  if pkg mysql-server || pkg mysql-server-5.1; then
-     pkgadd mysql-server
-     dpkg -P mysql-server-5.1
-     /etc/init.d/mysql restart
+  if pkg mysql-server || pkg mysql-server-5.5 || \
+     pkg mariadb-server || pkg mariadb-server-10.0
+  then
+     pkgadd default-mysql-server
+     dpkg -P mysql-server mysql-server-5.5 mariadb-server-10.0
+     service mysql restart
   fi
 }