From 72ef0ede740c92ce6087c02785aad91b8e1ef89c Mon Sep 17 00:00:00 2001
From: Igor Kulikov <ikulikov@thingsboard.io>
Date: Wed, 11 Mar 2020 16:36:08 +0200
Subject: [PATCH] Fix RPM preinst script

---
 application/src/main/scripts/control/rpm/preinst    | 6 +++---
 transport/coap/src/main/scripts/control/rpm/preinst | 6 +++---
 transport/http/src/main/scripts/control/rpm/preinst | 6 +++---
 transport/mqtt/src/main/scripts/control/rpm/preinst | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/application/src/main/scripts/control/rpm/preinst b/application/src/main/scripts/control/rpm/preinst
index e19fc884c8..db6306e4ac 100644
--- a/application/src/main/scripts/control/rpm/preinst
+++ b/application/src/main/scripts/control/rpm/preinst
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-getent group ${pkg.name} >/dev/null || groupadd -r ${pkg.name}
-getent passwd ${pkg.name} >/dev/null || \
-useradd -d ${pkg.installFolder} -g ${pkg.name} -M -r ${pkg.name} -s /sbin/nologin \
+getent group ${pkg.user} >/dev/null || groupadd -r ${pkg.user}
+getent passwd ${pkg.user} >/dev/null || \
+useradd -d ${pkg.installFolder} -g ${pkg.user} -M -r ${pkg.user} -s /sbin/nologin \
 -c "Thingsboard application"
diff --git a/transport/coap/src/main/scripts/control/rpm/preinst b/transport/coap/src/main/scripts/control/rpm/preinst
index e19fc884c8..db6306e4ac 100644
--- a/transport/coap/src/main/scripts/control/rpm/preinst
+++ b/transport/coap/src/main/scripts/control/rpm/preinst
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-getent group ${pkg.name} >/dev/null || groupadd -r ${pkg.name}
-getent passwd ${pkg.name} >/dev/null || \
-useradd -d ${pkg.installFolder} -g ${pkg.name} -M -r ${pkg.name} -s /sbin/nologin \
+getent group ${pkg.user} >/dev/null || groupadd -r ${pkg.user}
+getent passwd ${pkg.user} >/dev/null || \
+useradd -d ${pkg.installFolder} -g ${pkg.user} -M -r ${pkg.user} -s /sbin/nologin \
 -c "Thingsboard application"
diff --git a/transport/http/src/main/scripts/control/rpm/preinst b/transport/http/src/main/scripts/control/rpm/preinst
index e19fc884c8..db6306e4ac 100644
--- a/transport/http/src/main/scripts/control/rpm/preinst
+++ b/transport/http/src/main/scripts/control/rpm/preinst
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-getent group ${pkg.name} >/dev/null || groupadd -r ${pkg.name}
-getent passwd ${pkg.name} >/dev/null || \
-useradd -d ${pkg.installFolder} -g ${pkg.name} -M -r ${pkg.name} -s /sbin/nologin \
+getent group ${pkg.user} >/dev/null || groupadd -r ${pkg.user}
+getent passwd ${pkg.user} >/dev/null || \
+useradd -d ${pkg.installFolder} -g ${pkg.user} -M -r ${pkg.user} -s /sbin/nologin \
 -c "Thingsboard application"
diff --git a/transport/mqtt/src/main/scripts/control/rpm/preinst b/transport/mqtt/src/main/scripts/control/rpm/preinst
index e19fc884c8..db6306e4ac 100644
--- a/transport/mqtt/src/main/scripts/control/rpm/preinst
+++ b/transport/mqtt/src/main/scripts/control/rpm/preinst
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-getent group ${pkg.name} >/dev/null || groupadd -r ${pkg.name}
-getent passwd ${pkg.name} >/dev/null || \
-useradd -d ${pkg.installFolder} -g ${pkg.name} -M -r ${pkg.name} -s /sbin/nologin \
+getent group ${pkg.user} >/dev/null || groupadd -r ${pkg.user}
+getent passwd ${pkg.user} >/dev/null || \
+useradd -d ${pkg.installFolder} -g ${pkg.user} -M -r ${pkg.user} -s /sbin/nologin \
 -c "Thingsboard application"