From 2e60864e99e077af263fe7da0a11e7703a7733b0 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 20 Jun 2017 09:44:18 -0400
Subject: [PATCH] always stop and start zm on upgrade, not just if doing a db
 update

---
 distros/ubuntu1204/zoneminder.postinst | 78 +++++++++++++-------------
 1 file changed, 39 insertions(+), 39 deletions(-)

diff --git a/distros/ubuntu1204/zoneminder.postinst b/distros/ubuntu1204/zoneminder.postinst
index 9d786e27d..d01d27925 100644
--- a/distros/ubuntu1204/zoneminder.postinst
+++ b/distros/ubuntu1204/zoneminder.postinst
@@ -4,51 +4,51 @@ set -e
 
 if [ "$1" = "configure" ]; then
 
-    . /etc/zm/zm.conf
+  . /etc/zm/zm.conf
 
-    # The logs can contain passwords, etc... so by setting group root, only www-data can read them, not people in the www-data group
-    chown www-data:root /var/log/zm
-    chown www-data:www-data /var/lib/zm
-    if [ -z "$2" ]; then
-        chown www-data:www-data /var/cache/zoneminder /var/cache/zoneminder/*
-    fi
+  # The logs can contain passwords, etc... so by setting group root, only www-data can read them, not people in the www-data group
+  chown www-data:root /var/log/zm
+  chown www-data:www-data /var/lib/zm
+  if [ -z "$2" ]; then
+    chown www-data:www-data /var/cache/zoneminder /var/cache/zoneminder/*
+  fi
 
-    # Do this every time the package is installed or upgraded
+  # Do this every time the package is installed or upgraded
+  # Ensure zoneminder is stopped
+  invoke-rc.d zoneminder stop || true
 
-    if [ "$ZM_DB_HOST" = "localhost" ]; then
-        if [ -e "/etc/init.d/mysql" ]; then 
-            #
-            # Get mysql started if it isn't
-            #
-            if ! $(/etc/init.d/mysql status >/dev/null 2>&1); then
-                    invoke-rc.d mysql start
-            fi
-            if $(/etc/init.d/mysql status >/dev/null 2>&1); then
-                mysqladmin --defaults-file=/etc/mysql/debian.cnf -f reload
-                # test if database if already present...
-                if ! $(echo quit | mysql --defaults-file=/etc/mysql/debian.cnf zm > /dev/null 2> /dev/null) ; then
-                    cat /usr/share/zoneminder/db/zm_create.sql | mysql --defaults-file=/etc/mysql/debian.cnf
-                    # This creates the user.
-                    echo "grant lock tables, alter,select,insert,update,delete,create,index on ${ZM_DB_NAME}.* to '${ZM_DB_USER}'@localhost identified by \"${ZM_DB_PASS}\";" | mysql --defaults-file=/etc/mysql/debian.cnf mysql
-                else
-                    echo "grant lock tables, alter,select,insert,update,delete,create,index on ${ZM_DB_NAME}.* to '${ZM_DB_USER}'@localhost;" | mysql --defaults-file=/etc/mysql/debian.cnf mysql
-                fi
-
-                # Ensure zoneminder is stopped
-                invoke-rc.d zoneminder stop || true
-                zmupdate.pl --nointeractive
-                zmupdate.pl --nointeractive -f
-                echo "Done Updating, starting ZoneMinder"
-                invoke-rc.d zoneminder start || true
-            else
-                echo 'NOTE: mysql not running, please start mysql and run dpkg-reconfigure zoneminder when it is running.'
-            fi
-        else 
-            echo 'mysql not found, assuming remote server.'
+  if [ "$ZM_DB_HOST" = "localhost" ]; then
+    if [ -e "/etc/init.d/mysql" ]; then 
+      #
+      # Get mysql started if it isn't
+      #
+      if ! $(/etc/init.d/mysql status >/dev/null 2>&1); then
+        invoke-rc.d mysql start
+      fi
+      if $(/etc/init.d/mysql status >/dev/null 2>&1); then
+        mysqladmin --defaults-file=/etc/mysql/debian.cnf -f reload
+        # test if database if already present...
+        if ! $(echo quit | mysql --defaults-file=/etc/mysql/debian.cnf zm > /dev/null 2> /dev/null) ; then
+          cat /usr/share/zoneminder/db/zm_create.sql | mysql --defaults-file=/etc/mysql/debian.cnf
+          # This creates the user.
+          echo "grant lock tables, alter,select,insert,update,delete,create,index on ${ZM_DB_NAME}.* to '${ZM_DB_USER}'@localhost identified by \"${ZM_DB_PASS}\";" | mysql --defaults-file=/etc/mysql/debian.cnf mysql
+        else
+          echo "grant lock tables, alter,select,insert,update,delete,create,index on ${ZM_DB_NAME}.* to '${ZM_DB_USER}'@localhost;" | mysql --defaults-file=/etc/mysql/debian.cnf mysql
         fi
+
+        zmupdate.pl --nointeractive
+        zmupdate.pl --nointeractive -f
+      else
+        echo 'NOTE: mysql not running, please start mysql and run dpkg-reconfigure zoneminder when it is running.'
+      fi
     else 
-        echo "Not doing database upgrade due to remote db server ($ZM_DB_HOST)"
+      echo 'mysql not found, assuming remote server.'
     fi
+  else 
+    echo "Not doing database upgrade due to remote db server ($ZM_DB_HOST)"
+  fi
+  echo "Done Updating, starting ZoneMinder"
+  invoke-rc.d zoneminder start || true
 fi
 
 #DEBHELPER#