From d06751312fbbdce58390ce8d08b12ac98c5f1e3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1rcio=20Alexandre=20Silva=20Delgado?=
 <coadde@lavabit.com>
Date: Thu, 23 May 2013 00:40:35 -0300
Subject: ha-glue: fixing pkg

---
 pcr/ha-glue/PKGBUILD        |  2 +-
 pcr/ha-glue/ha-glue.install | 15 +++++----------
 2 files changed, 6 insertions(+), 11 deletions(-)

(limited to 'pcr')

diff --git a/pcr/ha-glue/PKGBUILD b/pcr/ha-glue/PKGBUILD
index ed46bc66d..ab23a80d2 100644
--- a/pcr/ha-glue/PKGBUILD
+++ b/pcr/ha-glue/PKGBUILD
@@ -3,7 +3,7 @@
 pkgname=ha-glue
 _pkgname=${pkgname:3}
 pkgver=1.0.11
-pkgrel=6
+pkgrel=7
 pkgdesc='Set of libraries, tools and utilities suitable for the Heartbeat/Pacemaker cluster stack'
 arch=(
   i686
diff --git a/pcr/ha-glue/ha-glue.install b/pcr/ha-glue/ha-glue.install
index abfedb7c4..05e2160d3 100644
--- a/pcr/ha-glue/ha-glue.install
+++ b/pcr/ha-glue/ha-glue.install
@@ -1,22 +1,17 @@
 _CLUSTER_USER=hacluster
 _CLUSTER_GROUP=haclient
-_PREFIX=/usr
-_PREFIXETC=/etc
-_PREFIXVAR=/var
-_LCRSODIR=$PREFIX/libexec/lcrso
 _DGID=666
 _DUID=666
+
 pre_install() {
 	getent group $_CLUSTER_GROUP >/dev/null || groupadd -r -g $_DGID $_CLUSTER_GROUP
-	getent passwd $_CLUSTER_USER >/dev/null || useradd -r -g $_CLUSTER_GROUP -u $_DUID -d /var/lib/heartbeat/cores/hacluster -s /sbin/nologin -c "cluster user" ${_CLUSTER_USER}
+	getent passwd $_CLUSTER_USER >/dev/null || useradd -r -g $_CLUSTER_GROUP -u $_DUID -d /var/lib/heartbeat/cores/hacluster -s /sbin/nologin -c 'cluster user' $_CLUSTER_USER
 }
 
 post_install() {
-	echo -e "\nNow you must install ha-resourceagent, ha-heartbeat and ha-pacemaker\n"
-
+	echo -e 'Now you must install ha-resourceagent, ha-heartbeat and ha-pacemaker'
 }
 post_remove() {
-	echo -e "\nDeleting user $_CLUSTER_USER and group $_CLUSTER_GROUP "
-	userdel $_CLUSTER_USER
-	groupdel $_CLUSTER_GROUP
+	echo -e "Deleting user $_CLUSTER_USER and group $_CLUSTER_GROUP"
+	userdel $_CLUSTER_USER && groupdel $_CLUSTER_GROUP
 }
-- 
cgit v1.2.3-2-g168b