From bdc4d14036d8b831ae7398ab35287bc080bd38cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Sun, 12 Apr 2015 16:19:44 +0200
Subject: [PATCH] Updated postinstall scripts

---
 packaging/deb/control/postinst |  4 ++--
 packaging/rpm/control/postinst | 26 ++++++++++++++------------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/packaging/deb/control/postinst b/packaging/deb/control/postinst
index 87659494351..f0d25c4345f 100755
--- a/packaging/deb/control/postinst
+++ b/packaging/deb/control/postinst
@@ -30,10 +30,10 @@ case "$1" in
 		"$GRAFANA_USER"
 	fi
 
-  if [ -x /opt/grafana/data/grafana.db ]; then
+  if [ -x /opt/grafana/ ]; then
     echo "### Upgrading Notice ### "
     echo "-- New grafana install home is /usr/share/grafana"
-    echo "-- Moving sqlite3 database to /var/lib/grafana/"
+    echo "-- Please move sqlite3 database to /var/lib/grafana/"
     echo "-- Notice: service name && binary changed to grafana-server"
   fi
 
diff --git a/packaging/rpm/control/postinst b/packaging/rpm/control/postinst
index 1cde7b1840b..20190d45f60 100644
--- a/packaging/rpm/control/postinst
+++ b/packaging/rpm/control/postinst
@@ -37,14 +37,7 @@ if [ $1 -eq 1 ] ; then
     -c "grafana user" grafana
 	fi
 
-  if [ -x /opt/grafana/data/grafana.db ]; then
-    echo "### Upgrading Notice ### "
-    echo "-- New grafana install home is /usr/share/grafana"
-    echo "-- Moving sqlite3 database to /var/lib/grafana/"
-    echo "-- Notice: service name && binary changed to grafana-server"
-  fi
-
-	# Set user permissions on /var/log/grafana, /var/lib/grafana
+ 	# Set user permissions on /var/log/grafana, /var/lib/grafana
 	mkdir -p /var/log/grafana /var/lib/grafana
 	chown -R $GRAFANA_USER:$GRAFANA_GROUP /var/log/grafana /var/lib/grafana
 	chmod 755 /var/log/grafana /var/lib/grafana
@@ -61,14 +54,23 @@ if [ $1 -eq 1 ] ; then
     echo " sudo /bin/systemctl enable grafana-server.service"
     echo "### You can start grafana-server by executing"
     echo " sudo /bin/systemctl start grafana-server.service"
-
   elif [ -x /sbin/chkconfig ] ; then
     echo "### NOT starting grafana-server by default on bootup, please execute"
     echo " sudo /sbin/chkconfig --add grafana-server"
     echo "### In order to start grafana-server, execute"
     echo " sudo service grafana-server start"
   fi
-elif [ $1 -ge 2 -a "$RESTART_ON_UPGRADE" == "true" ] ; then
-  stopGrafana
-  startGrafana
+
+elif [ $1 -ge 2 ] ; then
+  if [ -x /opt/grafana/ ]; then
+    echo "### Upgrading Notice ### "
+    echo "-- New grafana install home is /usr/share/grafana"
+    echo "-- Please move sqlite3 database to /var/lib/grafana/"
+    echo "-- Notice: service name && binary changed to grafana-server"
+  fi
+
+  if [ "$RESTART_ON_UPGRADE" == "true" ]; then
+    stopGrafana
+    startGrafana
+  fi
 fi