From 44f0880cda2259246e136be7f9e0471b61734430 Mon Sep 17 00:00:00 2001
From: Márcio Alexandre Silva Delgado <coadde@lavabit.com>
Date: Thu, 20 Jun 2013 03:30:35 -0300
Subject: ganglia: fixing package

---
 pcr/ganglia/ganglia.install | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

(limited to 'pcr/ganglia/ganglia.install')

diff --git a/pcr/ganglia/ganglia.install b/pcr/ganglia/ganglia.install
index 60b7f102d..814a993bc 100644
--- a/pcr/ganglia/ganglia.install
+++ b/pcr/ganglia/ganglia.install
@@ -7,26 +7,24 @@ post_install() {
 # arg 2:  the old package version
 post_upgrade() {
   if [ "`vercmp $2 3.4.0`" -lt 0 ]; then
-    echo "WARNING: The ganglia package has been split. If you use the" \
-         "web frontend, you'll need to install the ganglia-web package as well."
+    echo 'WARNING: The ganglia package has been split. If you use the' \
+         'web frontend, you'll need to install the ganglia-web package as well.'
   fi
   id ganglia  >& /dev/null
   if [ $? -ne 0 ]; then
-     echo "Adding ganglia system group and user..."
-     groupadd -r ganglia
-     useradd -r -d /var/lib/ganglia -g ganglia -s /bin/false ganglia
+     echo 'Adding ganglia system group and user...'
+     groupadd -r ganglia && useradd -r -d /var/lib/ganglia -g ganglia -s /bin/false ganglia
      # Lock the account to prevent logging in
      passwd -l ganglia &> /dev/null
   fi
-  install -d -o ganglia -g ganglia /var/lib/ganglia
-  install -d -o ganglia -g ganglia /var/lib/ganglia/rrds
+  install -d -o ganglia -g ganglia /var/lib/ganglia && install -d -o ganglia -g ganglia /var/lib/ganglia/rrds
 }
 
 # arg 1:  the old package version
 post_remove() {
-  echo "Removing ganglia system group and user..."
+  echo 'Removing ganglia system group and user...'
   userdel ganglia
-  echo "NOTE: Please remove /var/lib/ganglia manually if it is no longer required."
+  echo 'NOTE: Please remove /var/lib/ganglia manually if it is no longer required.'
 }
 
 # vim:set ts=2 sw=2 et:
-- 
cgit v1.2.3-54-g00ecf


From 2ea4fee3286319c7f08c4ef0862be2e156f2a860 Mon Sep 17 00:00:00 2001
From: Márcio Alexandre Silva Delgado <coadde@lavabit.com>
Date: Thu, 20 Jun 2013 03:57:09 -0300
Subject: ganglia: fixing type

---
 pcr/ganglia/PKGBUILD        |  2 +-
 pcr/ganglia/ganglia.install | 16 +++++-----------
 2 files changed, 6 insertions(+), 12 deletions(-)

(limited to 'pcr/ganglia/ganglia.install')

diff --git a/pcr/ganglia/PKGBUILD b/pcr/ganglia/PKGBUILD
index 9a2cfae84..9fed072aa 100644
--- a/pcr/ganglia/PKGBUILD
+++ b/pcr/ganglia/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=ganglia
 pkgver=3.6.0
-pkgrel=3
+pkgrel=4
 pkgdesc='Scalable distributed monitoring system for high-performance computing systems such as clusters and Grids.'
 arch=(
   i686
diff --git a/pcr/ganglia/ganglia.install b/pcr/ganglia/ganglia.install
index 814a993bc..6a196af1f 100644
--- a/pcr/ganglia/ganglia.install
+++ b/pcr/ganglia/ganglia.install
@@ -1,14 +1,7 @@
-# arg 1:  the new package version
 post_install() {
-  post_upgrade
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
   if [ "`vercmp $2 3.4.0`" -lt 0 ]; then
     echo 'WARNING: The ganglia package has been split. If you use the' \
-         'web frontend, you'll need to install the ganglia-web package as well.'
+         "web frontend, you'll need to install the ganglia-web package as well."
   fi
   id ganglia  >& /dev/null
   if [ $? -ne 0 ]; then
@@ -20,11 +13,12 @@ post_upgrade() {
   install -d -o ganglia -g ganglia /var/lib/ganglia && install -d -o ganglia -g ganglia /var/lib/ganglia/rrds
 }
 
-# arg 1:  the old package version
+post_upgrade() {
+  post_install
+}
+
 post_remove() {
   echo 'Removing ganglia system group and user...'
   userdel ganglia
   echo 'NOTE: Please remove /var/lib/ganglia manually if it is no longer required.'
 }
-
-# vim:set ts=2 sw=2 et:
-- 
cgit v1.2.3-54-g00ecf