Allow user group to already exist

3 files changed, 16 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6e5b8a9907b4..8d1484bf87ae 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mcsctl-git
 	pkgdesc = Manage multiple minecraft servers with a simple bash script and systemd unit templates.
-	pkgver = 2.2.0.r19.gc862ceb
+	pkgver = 3.0.0.r0.g9f1b8b7
 	pkgrel = 1
 	url = https://github.com/Hetsh/mcsctl
 	install = mcsctl-git.install
diff --git a/PKGBUILD b/PKGBUILD
index 56419806fba1..86a18eb86cad 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: peterfab9845 <archlinux@peterfab.com>
 
 pkgname=mcsctl-git
-pkgver=2.2.0.r19.gc862ceb
+pkgver=3.0.0.r0.g9f1b8b7
 pkgrel=1
 pkgdesc='Manage multiple minecraft servers with a simple bash script and systemd unit templates.'
 arch=('any')
diff --git a/mcsctl-git.install b/mcsctl-git.install
index 16fd88158bca..9e530464ea60 100644
--- a/mcsctl-git.install
+++ b/mcsctl-git.install
@@ -8,10 +8,23 @@ user_exists() {
 	fi
 }
 
+group_exists() {
+	if getent group "$MCS_USER" > /dev/null; then
+		return $(true)
+	else
+		return $(false)
+	fi
+}
+
 post_install() {
+	if ! group_exists; then
+		echo "Adding group \"$MCS_USER\"..."
+		groupadd "$MCS_USER"
+	fi
+
 	if ! user_exists; then
 		echo "Adding user \"$MCS_USER\"..."
-		useradd --user-group --comment 'Minecraft user' --shell /usr/bin/nologin --create-home "$MCS_USER" &> /dev/null
+		useradd --gid "$MCS_USER" --comment 'Minecraft user' --shell /usr/bin/nologin --create-home "$MCS_USER" &> /dev/null
 		passwd --lock "$MCS_USER" > /dev/null
 	fi
 }