2.13.1

- update config patch in .install file
- clean up PKGBUILD for legibility

Upstream Changelog:
2.13.1
	- Language updates
2.13.0
	- Organization enterprise policies
		- Two-step login policy
		- Master password policy
		- Password generator policy
	- New importer tools
	- Clone items from my vault
	- Bug fixes
	- Language updates

3 files changed, 23 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7ef7b97a2496..caa4ce95cc6b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = bitwarden_rs-vault
 	pkgdesc = Integrates the Vault Web-Interface into bitwarden_rs.
-	pkgver = 2.12.0
-	pkgrel = 2
+	pkgver = 2.13.1
+	pkgrel = 1
 	url = https://github.com/bitwarden/web
 	install = bitwarden_rs-vault.install
 	arch = any
@@ -12,16 +12,17 @@ pkgbase = bitwarden_rs-vault
 	makedepends = git
 	depends = bitwarden_rs
 	conflicts = bitwarden_rs-vault-git
-	source = https://github.com/bitwarden/web/archive/v2.12.0.tar.gz
-	source = https://github.com/bitwarden/jslib/archive/255bd3962d268bec8f66411676049803bb29e0d3.tar.gz
+	conflicts = bitwarden_rs-vault-bin
+	source = https://github.com/bitwarden/web/archive/v2.13.1.tar.gz
+	source = https://github.com/bitwarden/jslib/archive/0a30c7eb1ecbac500e6c55a7d4024d98efa982bc.tar.gz
 	source = 0001-Set-Vault-BaseURL.patch
 	source = 0002-Disable-Git-Submodule-Commands.patch
 	source = bitwarden_rs-vault.install
-	sha512sums = 098191b55473259483bfd545d04f534627957fd19e5938f25d65b3c68ce9bc8e38c469de731a43bd141e3bb15f3b3d8761c29ce511ad4eeffc2ceacd1a5af0f9
-	sha512sums = e2b8cbb83d1997899378e8a09b0bc4a6aff05d194a58ca25d29845970344579eaa70f8ab6d3ef0b93125d2971e63307692e468de3a03e5a63aa6fbe7fcc2660f
+	sha512sums = ce6df30c342851bff8cc6d2ca598b98a131aedf63ef32c195e552e3dfd0540f3aa33cff825d45ad159855446de32a574feb76df3af211ccfb9c288347f4c5e37
+	sha512sums = c6ce73345e59b77689aca8a59da539ddb9efc8f7ed77e2172397e8fe959a68448bb576d1ff0bbe1615de45e45113210e1ef94cd632a0111559dd7f125a622c52
 	sha512sums = cd4764f1b5ff6dc2a139da3c806d9c51c4c813acedd07afdcb19f483d8363db5f24c843c85525df4b95886e3c7b16432a26463157e53d316ae4633afe863cf7f
 	sha512sums = adaa6037e59f08a6a44f681c8eab915c0738069989f9d6acbf46e4d3135f69696fa7735a65158979fbc924b27f43bdf255648e615b33495ac7da418e89f27c90
-	sha512sums = 5265612afd40cb757e7d6550ca902f9c02c558e7d03607a181df923374efdf9eff85296c216db7c96d9987eb1fe0834a7eb90de7dcd988c9f7443dc69b9469b1
+	sha512sums = 0b93ea1a442f15ac2445bc0cb759887b0826215edbc73dabb150de8ac136c8712c18b798ff397a06d50989332562a36382b5b7d962e60c2f2619d0f46cf9b04d
 
 pkgname = bitwarden_rs-vault
 
diff --git a/PKGBUILD b/PKGBUILD
index d1ded6e1c4fd..b35a8bf37af3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,9 @@
 # Maintainer: Markus Richter <mqus at disroot dot org>
 
-_jslib_commit="255bd3962d268bec8f66411676049803bb29e0d3"
+_jslib_commit="0a30c7eb1ecbac500e6c55a7d4024d98efa982bc"
 pkgname=bitwarden_rs-vault
-pkgver=2.12.0
-pkgrel=2
+pkgver=2.13.1
+pkgrel=1
 pkgdesc="Integrates the Vault Web-Interface into bitwarden_rs."
 arch=('any')
 url="https://github.com/bitwarden/web"
@@ -13,34 +13,37 @@ 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-git") 
+conflicts=("bitwarden_rs-vault-git" "bitwarden_rs-vault-bin") 
 install=bitwarden_rs-vault.install
 source=("https://github.com/bitwarden/web/archive/v$pkgver.tar.gz"
 	"https://github.com/bitwarden/jslib/archive/${_jslib_commit}.tar.gz"
 	"0001-Set-Vault-BaseURL.patch"
 	"0002-Disable-Git-Submodule-Commands.patch"
 	"$pkgname.install")
-sha512sums=('098191b55473259483bfd545d04f534627957fd19e5938f25d65b3c68ce9bc8e38c469de731a43bd141e3bb15f3b3d8761c29ce511ad4eeffc2ceacd1a5af0f9'
-            'e2b8cbb83d1997899378e8a09b0bc4a6aff05d194a58ca25d29845970344579eaa70f8ab6d3ef0b93125d2971e63307692e468de3a03e5a63aa6fbe7fcc2660f'
+sha512sums=('ce6df30c342851bff8cc6d2ca598b98a131aedf63ef32c195e552e3dfd0540f3aa33cff825d45ad159855446de32a574feb76df3af211ccfb9c288347f4c5e37'
+            'c6ce73345e59b77689aca8a59da539ddb9efc8f7ed77e2172397e8fe959a68448bb576d1ff0bbe1615de45e45113210e1ef94cd632a0111559dd7f125a622c52'
             'cd4764f1b5ff6dc2a139da3c806d9c51c4c813acedd07afdcb19f483d8363db5f24c843c85525df4b95886e3c7b16432a26463157e53d316ae4633afe863cf7f'
             'adaa6037e59f08a6a44f681c8eab915c0738069989f9d6acbf46e4d3135f69696fa7735a65158979fbc924b27f43bdf255648e615b33495ac7da418e89f27c90'
-            '5265612afd40cb757e7d6550ca902f9c02c558e7d03607a181df923374efdf9eff85296c216db7c96d9987eb1fe0834a7eb90de7dcd988c9f7443dc69b9469b1')
+            '0b93ea1a442f15ac2445bc0cb759887b0826215edbc73dabb150de8ac136c8712c18b798ff397a06d50989332562a36382b5b7d962e60c2f2619d0f46cf9b04d')
 
 
 prepare() {
-	#patch paths
 	cd "$srcdir/web-$pkgver"
+	
+	# patch paths
 	patch -N -p1 -i "$srcdir/0001-Set-Vault-BaseURL.patch"
+	
 	# fix for AUR-snapshot tarballs
 	patch -N -p1 -i "$srcdir/0002-Disable-Git-Submodule-Commands.patch"
-	#simulate git-submodules
+	
+	# simulate git-submodules
 	rmdir jslib
 	ln -s "../jslib-${_jslib_commit}" jslib
 
 }
 
 build() {
-	#build vault webinterface
+	# build vault webinterface
 	cd "$srcdir/web-$pkgver"
 	npm install --cache "${srcdir}/npm-cache" 
 	npm run dist --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/