updpkg, fix conflicts array and beautify output

3 files changed, 11 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8e00152135c8..830c4ed31d48 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 = 0.10.0.r0.g03172a6
+	pkgver = 0.11.0.r0.g48e69ce
 	pkgrel = 1
 	url = https://github.com/dani-garcia/bitwarden_rs
 	install = bitwarden_rs.install
@@ -14,15 +14,13 @@ pkgbase = bitwarden_rs-git
 	depends = openssl
 	provides = bitwarden_rs
 	conflicts = bitwarden_rs
-	conflicts = bitwarden_rs-vault-git
-	conflicts = bitwarden_rs-vault
 	backup = etc/bitwarden_rs.env
 	source = git+https://github.com/dani-garcia/bitwarden_rs.git
 	source = bitwarden_rs.install
 	source = bitwarden_rs.service
 	source = 0001-Disable-Vault.patch
 	sha512sums = SKIP
-	sha512sums = ad8fba5e283ee8f61d1597725afcb12339f495e9b352a4232d1aa50a4b7976fb23a48f15ee48384c0a1bd66c186c3a984c7cce2811da15cf40b338699eadab72
+	sha512sums = f2987e720ec008372862b18479c48cd3be8c66ebe4eb2d8595b5bc238e6c18ccc7f82fd499e5ab0d701aaae60447d8e98fb8514eebe3ceac1fc4dd831974099c
 	sha512sums = 773dc0830b4eaf3a1d4134a52a6157e6a94265c6212ae8cc24b9584f9c444b9a0f822325f487ce9c23c363f743f1f64f269352f030e98e336816aee0a68048f6
 	sha512sums = 704057f0bf6d71ab9888378c3d66ee97c5019e8b18d0f22f93615fef60bef7df80a11ad7ebf5cca1cc49c90ba3f9d84515a160555e395790f325510f8a81f5cd
 
diff --git a/PKGBUILD b/PKGBUILD
index 934bba815724..548827bb7cb2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=bitwarden_rs-git
 _pkgbase=bitwarden_rs
-pkgver=0.10.0.r0.g03172a6
+pkgver=0.11.0.r0.g48e69ce
 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')
@@ -12,7 +12,7 @@ groups=()
 makedepends=('rust-nightly' 'cargo-nightly')
 depends=('openssl')
 provides=("$_pkgbase") 
-conflicts=("$_pkgbase" "${_pkgbase}-vault-git" "${_pkgbase}-vault") 
+conflicts=("$_pkgbase") 
 replaces=()
 backup=('etc/bitwarden_rs.env')
 options=()
@@ -23,7 +23,7 @@ source=('git+https://github.com/dani-garcia/bitwarden_rs.git'
 	"0001-Disable-Vault.patch")
 noextract=()
 sha512sums=('SKIP'
-            'ad8fba5e283ee8f61d1597725afcb12339f495e9b352a4232d1aa50a4b7976fb23a48f15ee48384c0a1bd66c186c3a984c7cce2811da15cf40b338699eadab72'
+            'f2987e720ec008372862b18479c48cd3be8c66ebe4eb2d8595b5bc238e6c18ccc7f82fd499e5ab0d701aaae60447d8e98fb8514eebe3ceac1fc4dd831974099c'
             '773dc0830b4eaf3a1d4134a52a6157e6a94265c6212ae8cc24b9584f9c444b9a0f822325f487ce9c23c363f743f1f64f269352f030e98e336816aee0a68048f6'
             '704057f0bf6d71ab9888378c3d66ee97c5019e8b18d0f22f93615fef60bef7df80a11ad7ebf5cca1cc49c90ba3f9d84515a160555e395790f325510f8a81f5cd')
 
diff --git a/bitwarden_rs.install b/bitwarden_rs.install
index f55daec64c11..16ab32adaaad 100644
--- a/bitwarden_rs.install
+++ b/bitwarden_rs.install
@@ -11,23 +11,27 @@ post_install() {
 	# Load service file
 	systemctl --quiet daemon-reload
 	
+	echo ""
 	echo "##########"
 	echo "#"
 	echo "#   Remember to configure the server via its environment-variables under /etc/bitwarden_rs.env"
 	echo "#   After that, start/enable the server via 'systemctl enable bitwarden_rs.service --now'"
 	echo "#"
 	echo "##########"
+	echo ""
 
 }
 
 post_upgrade() {
 	# Reload service file
 	systemctl --quiet daemon-reload
+	echo ""
 	echo "##########"
 	echo "#"
 	echo "#   Remember to restart the bitwarden via 'systemctl restart bitwarden_rs.service', if neccessary."
 	echo "#"
 	echo "##########"
+	echo ""
 
 }
 
@@ -39,10 +43,12 @@ pre_remove() {
 post_remove() {
 	# Unload service
 	systemctl --quiet daemon-reload
+	echo ""
 	echo "##########"
 	echo "#"
 	echo "#   Remember to remove the user/group bitwarden_rs, if neccessary."
 	echo "#   All server data in /var/lib/bitwarden_rs was NOT deleted!"
 	echo "#"
 	echo "##########"
+	echo ""
 }