fixed user creation and possible shadow.service error messages

3 files changed, 13 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 435f052ecc20..899e8d621637 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = bitwarden_rs-git
 	pkgdesc = An unofficial lightweight implementation of the bitwarden-server using rust and sqlite. Does NOT include the web-interface.
-	pkgver = r166.470ad14
+	pkgver = r169.2f892cb
 	pkgrel = 1
 	url = https://github.com/dani-garcia/bitwarden_rs
 	install = bitwarden_rs.install
@@ -22,7 +22,7 @@ pkgbase = bitwarden_rs-git
 	source = bitwarden_rs.service
 	source = 0001-Disable-Vault.patch
 	sha512sums = SKIP
-	sha512sums = ea6ac7d915887078d7e091b99d53f2ee6fbf11ad5a80e04309263e7b06ce43de6e90e69ad62e3c99eaf81f825aebe930bf45888041225a156d74f324dfa10578
+	sha512sums = e7952d8a47b1b023b00d693ef43676e4e13f4820e27447b613be51ffa18f4880e02838fc7bcef0606d537606e950d6ca535acf03ca17b38edb3b6391fa8ca043
 	sha512sums = 773dc0830b4eaf3a1d4134a52a6157e6a94265c6212ae8cc24b9584f9c444b9a0f822325f487ce9c23c363f743f1f64f269352f030e98e336816aee0a68048f6
 	sha512sums = 704057f0bf6d71ab9888378c3d66ee97c5019e8b18d0f22f93615fef60bef7df80a11ad7ebf5cca1cc49c90ba3f9d84515a160555e395790f325510f8a81f5cd
 
diff --git a/PKGBUILD b/PKGBUILD
index 6ef736e5d394..ceb271a23c96 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=bitwarden_rs-git
 _pkgbase=bitwarden_rs
-pkgver=r166.470ad14
+pkgver=r169.2f892cb
 pkgrel=1
 pkgdesc="An unofficial lightweight implementation of the bitwarden-server using rust and sqlite. Does NOT include the web-interface."
 arch=('i686' 'x86_64' 'armv7h' 'aarch64')
@@ -23,7 +23,7 @@ source=('git+https://github.com/dani-garcia/bitwarden_rs.git'
 	"0001-Disable-Vault.patch")
 noextract=()
 sha512sums=('SKIP'
-            'ea6ac7d915887078d7e091b99d53f2ee6fbf11ad5a80e04309263e7b06ce43de6e90e69ad62e3c99eaf81f825aebe930bf45888041225a156d74f324dfa10578'
+            'e7952d8a47b1b023b00d693ef43676e4e13f4820e27447b613be51ffa18f4880e02838fc7bcef0606d537606e950d6ca535acf03ca17b38edb3b6391fa8ca043'
             '773dc0830b4eaf3a1d4134a52a6157e6a94265c6212ae8cc24b9584f9c444b9a0f822325f487ce9c23c363f743f1f64f269352f030e98e336816aee0a68048f6'
             '704057f0bf6d71ab9888378c3d66ee97c5019e8b18d0f22f93615fef60bef7df80a11ad7ebf5cca1cc49c90ba3f9d84515a160555e395790f325510f8a81f5cd')
 
diff --git a/bitwarden_rs.install b/bitwarden_rs.install
index 3a6f11fe9511..2f6d1deb1c1f 100644
--- a/bitwarden_rs.install
+++ b/bitwarden_rs.install
@@ -2,13 +2,15 @@ post_install() {
 	# Create users and data directory
 	
 	echo "Adding user bitwarden_rs and creating data directory /var/lib/bitwarden_rs ..."
-	useradd -Ur -s /usr/bin/nologin bitwarden_rs
-	mkdir -p /var/lib/bitwarden_rs -m 0750
+	mkdir -p /var/lib/bitwarden_rs
+	getent group bitwarden_rs &>/dev/null || groupadd -r bitwarden_rs >/dev/null
+	getent passwd bitwarden_rs &>/dev/null || useradd -r -g bitwarden_rs -d /var/lib/bitwarden_rs -s /usr/bin/nologin bitwarden_rs >/dev/null
 	chown bitwarden_rs:bitwarden_rs /var/lib/bitwarden_rs
-	# Add service file
+	chmod 0750 /var/lib/bitwarden_rs
+	
+	# Load service file
 	systemctl --quiet daemon-reload
 	
-
 	echo "##########"
 	echo "# "
 	echo "#   Remember to configure the server via its environment-variables under /etc/bitwarden_rs.env"
@@ -16,10 +18,10 @@ post_install() {
 	echo "#"
 	echo "##########"
 
-#	systemctl --quiet preset bitwarden_rs.service
 }
 
 post_upgrade() {
+	#reload service file
 	systemctl --quiet daemon-reload
 	echo "##########"
 	echo "# "
@@ -30,10 +32,12 @@ post_upgrade() {
 }
 
 pre_remove() {
+	#stop service
 	systemctl --quiet --no-reload disable --now bitwarden_rs.service
 }
 
 post_remove() {
+	#unload service
 	systemctl --quiet daemon-reload
 	echo "##########"
 	echo "# "