updpkg, fixed some comments and pkgver()

3 files changed, 18 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3cd0d703c5c5..29ce44ab135f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = bitwarden_rs-vault-git
 	pkgdesc = An unofficial lightweight implementation of the bitwarden-server using rust and sqlite. Includes the web-interface 'vault'.
-	pkgver = r169.2f892cb
+	pkgver = 0.10.0.r2.g55b7a3e
 	pkgrel = 1
 	url = https://github.com/dani-garcia/bitwarden_rs
 	install = bitwarden_rs.install
@@ -29,7 +29,7 @@ pkgbase = bitwarden_rs-vault-git
 	sha512sums = 493588b8ec965775d0bcb58e5830d6c523131858957d5656d0480edcc93a45860606d190f0d0847ce529f43911efad4af7ca8bd2b0f21d12c05da333dcb1b4d5
 	sha512sums = c2c8971abc23d874d8f822f59f1543c3f3a5bba106b146ec2065256c77209857e5915281de1b93efe8b937a1c172592e0c20b8ac1b50bf323eb54014b097156c
 	sha512sums = 5fd4ca0f1a87170a6753b9fd4fa38b77a877a3415a936d08550ffe5dfac272974221e9d61c53b6391fff85dc6ced57113117fb0d27ba19bd07ef1b5424a2e44a
-	sha512sums = e7952d8a47b1b023b00d693ef43676e4e13f4820e27447b613be51ffa18f4880e02838fc7bcef0606d537606e950d6ca535acf03ca17b38edb3b6391fa8ca043
+	sha512sums = f2987e720ec008372862b18479c48cd3be8c66ebe4eb2d8595b5bc238e6c18ccc7f82fd499e5ab0d701aaae60447d8e98fb8514eebe3ceac1fc4dd831974099c
 	sha512sums = 773dc0830b4eaf3a1d4134a52a6157e6a94265c6212ae8cc24b9584f9c444b9a0f822325f487ce9c23c363f743f1f64f269352f030e98e336816aee0a68048f6
 
 pkgname = bitwarden_rs-vault-git
diff --git a/PKGBUILD b/PKGBUILD
index c5e10d2396f9..b3951bf6ba19 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=bitwarden_rs-vault-git
 _pkgbase=bitwarden_rs
-pkgver=r169.2f892cb
+pkgver=0.10.0.r2.g55b7a3e
 _vaultver=1.27.0
 pkgrel=1
 pkgdesc="An unofficial lightweight implementation of the bitwarden-server using rust and sqlite. Includes the web-interface 'vault'."
@@ -29,18 +29,19 @@ sha512sums=('SKIP'
             '493588b8ec965775d0bcb58e5830d6c523131858957d5656d0480edcc93a45860606d190f0d0847ce529f43911efad4af7ca8bd2b0f21d12c05da333dcb1b4d5'
             'c2c8971abc23d874d8f822f59f1543c3f3a5bba106b146ec2065256c77209857e5915281de1b93efe8b937a1c172592e0c20b8ac1b50bf323eb54014b097156c'
             '5fd4ca0f1a87170a6753b9fd4fa38b77a877a3415a936d08550ffe5dfac272974221e9d61c53b6391fff85dc6ced57113117fb0d27ba19bd07ef1b5424a2e44a'
-            'e7952d8a47b1b023b00d693ef43676e4e13f4820e27447b613be51ffa18f4880e02838fc7bcef0606d537606e950d6ca535acf03ca17b38edb3b6391fa8ca043'
+            'f2987e720ec008372862b18479c48cd3be8c66ebe4eb2d8595b5bc238e6c18ccc7f82fd499e5ab0d701aaae60447d8e98fb8514eebe3ceac1fc4dd831974099c'
             '773dc0830b4eaf3a1d4134a52a6157e6a94265c6212ae8cc24b9584f9c444b9a0f822325f487ce9c23c363f743f1f64f269352f030e98e336816aee0a68048f6')
 
 
 pkgver() {
 	cd "$srcdir/$_pkgbase"
 	( set -o pipefail
-	    git describe --long 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
+	    git describe --long --tags 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
 	    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 	)
 }
 prepare() {
+	#follow https://github.com/dani-garcia/bitwarden_rs/blob/master/BUILD.md AND remove the package-lock to fix gulp execution (see https://github.com/gulpjs/gulp/issues/2162 )
 	cd "$srcdir/web-$_vaultver"
 	#fix gulp install
 	rm package-lock.json
diff --git a/bitwarden_rs.install b/bitwarden_rs.install
index 2f6d1deb1c1f..16ab32adaaad 100644
--- a/bitwarden_rs.install
+++ b/bitwarden_rs.install
@@ -11,38 +11,44 @@ post_install() {
 	# Load service file
 	systemctl --quiet daemon-reload
 	
+	echo ""
 	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
+	# Reload service file
 	systemctl --quiet daemon-reload
+	echo ""
 	echo "##########"
-	echo "# "
+	echo "#"
 	echo "#   Remember to restart the bitwarden via 'systemctl restart bitwarden_rs.service', if neccessary."
 	echo "#"
 	echo "##########"
+	echo ""
 
 }
 
 pre_remove() {
-	#stop service
+	# Stop service
 	systemctl --quiet --no-reload disable --now bitwarden_rs.service
 }
 
 post_remove() {
-	#unload service
+	# Unload service
 	systemctl --quiet daemon-reload
+	echo ""
 	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 ""
 }