update conflicts, .install file.

3 files changed, 10 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bea72b8e0e65..e920060cd970 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = bitwarden_rs-vault-git
 	pkgdesc = Integrates the Vault Web-Interface into bitwarden_rs.
-	pkgver = v2.12.0.r37.g292d7134
+	pkgver = v2.13.1.r0.geaa6bc12
 	pkgrel = 1
 	url = https://github.com/bitwarden/web
 	install = bitwarden_rs-vault.install
@@ -13,12 +13,13 @@ pkgbase = bitwarden_rs-vault-git
 	depends = bitwarden_rs
 	provides = bitwarden_rs-vault
 	conflicts = bitwarden_rs-vault
+	conflicts = bitwarden_rs-vault-bin
 	source = git+https://github.com/bitwarden/web.git
 	source = 0001-Set-Vault-BaseURL.patch
 	source = bitwarden_rs-vault.install
 	sha512sums = SKIP
 	sha512sums = cd4764f1b5ff6dc2a139da3c806d9c51c4c813acedd07afdcb19f483d8363db5f24c843c85525df4b95886e3c7b16432a26463157e53d316ae4633afe863cf7f
-	sha512sums = 5265612afd40cb757e7d6550ca902f9c02c558e7d03607a181df923374efdf9eff85296c216db7c96d9987eb1fe0834a7eb90de7dcd988c9f7443dc69b9469b1
+	sha512sums = 0b93ea1a442f15ac2445bc0cb759887b0826215edbc73dabb150de8ac136c8712c18b798ff397a06d50989332562a36382b5b7d962e60c2f2619d0f46cf9b04d
 
 pkgname = bitwarden_rs-vault-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 8f43707f9188..4c8fe2a19f74 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Markus Richter <mqus at disroot dot org>
 
 pkgname=bitwarden_rs-vault-git
-pkgver=v2.12.0.r37.g292d7134
+pkgver=v2.13.1.r0.geaa6bc12
 pkgrel=1
 pkgdesc="Integrates the Vault Web-Interface into bitwarden_rs."
 arch=('any')
@@ -12,7 +12,7 @@ license=('AGPL3')
 # python2 is included because the used npm package node-sass depends on node-gyp (and therefore python2) transitively. This should be covered by the official node-gyp package (https://bugs.archlinux.org/task/62277?project=5&string=node-gyp ) which is pulled in by npm.
 makedepends=('npm' 'nodejs-lts-dubnium' 'python2' 'git')
 depends=('bitwarden_rs')
-conflicts=("bitwarden_rs-vault")
+conflicts=("bitwarden_rs-vault" "bitwarden_rs-vault-bin")
 provides=('bitwarden_rs-vault') 
 install=bitwarden_rs-vault.install
 source=("git+https://github.com/bitwarden/web.git"
@@ -20,7 +20,7 @@ source=("git+https://github.com/bitwarden/web.git"
 	"${pkgname%-git}.install")
 sha512sums=('SKIP'
             'cd4764f1b5ff6dc2a139da3c806d9c51c4c813acedd07afdcb19f483d8363db5f24c843c85525df4b95886e3c7b16432a26463157e53d316ae4633afe863cf7f'
-            '5265612afd40cb757e7d6550ca902f9c02c558e7d03607a181df923374efdf9eff85296c216db7c96d9987eb1fe0834a7eb90de7dcd988c9f7443dc69b9469b1')
+            '0b93ea1a442f15ac2445bc0cb759887b0826215edbc73dabb150de8ac136c8712c18b798ff397a06d50989332562a36382b5b7d962e60c2f2619d0f46cf9b04d')
 
 pkgver() {
         cd "$srcdir/web"
@@ -31,13 +31,13 @@ pkgver() {
 }
 
 prepare() {
-	#patch paths
+	# patch paths
 	cd "$srcdir/web"
 	patch -N -p1 -i "$srcdir/0001-Set-Vault-BaseURL.patch" 
 }
 
 build() {
-	#build vault webinterface
+	# build vault webinterface
 	cd "$srcdir/web"
 	npm install --cache "${srcdir}/npm-cache" 
 	npm run sub:init --cache "${srcdir}/npm-cache" 
diff --git a/bitwarden_rs-vault.install b/bitwarden_rs-vault.install
index 199636f66a27..10dae3ef0ede 100644
--- a/bitwarden_rs-vault.install
+++ b/bitwarden_rs-vault.install
@@ -3,7 +3,7 @@ post_install() {
 	echo "Trying to automatically reconfigure bitwarden_rs by patching /etc/bitwarden_rs.env ..."
 	echo '--- /etc/bitwarden_rs.env       2018-07-12 12:10:14.679534090 +0200
 +++ /etc/bitwarden_rs.env       2018-07-12 12:21:34.165391938 +0200
-@@ -13,4 +13,4 @@
+@@ -35,4 +35,4 @@
  ## Web vault settings
 -# WEB_VAULT_FOLDER=web-vault/
 +WEB_VAULT_FOLDER=/usr/share/bitwarden_rs/vault/
@@ -28,7 +28,7 @@ post_remove() {
 	echo "Trying to automatically reconfigure bitwarden_rs by patching /etc/bitwarden_rs.env ..."
 	echo '--- /etc/bitwarden_rs.env       2018-07-12 12:10:14.679534090 +0200
 +++ /etc/bitwarden_rs.env       2018-07-12 12:21:34.165391938 +0200
-@@ -13,4 +13,4 @@
+@@ -35,4 +35,4 @@
  ## Web vault settings
 -WEB_VAULT_FOLDER=/usr/share/bitwarden_rs/vault/
 +# WEB_VAULT_FOLDER=web-vault/