upgpkg: keeweb 1.7.2

3 files changed, 19 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d47a9b12e579..be699fdb28d8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = keeweb-git
 	pkgdesc = Desktop password manager compatible with KeePass databases. (develop branch)
-	pkgver = 1.6.3+192+g9b9cda3
+	pkgver = 1.7.2+6+g0c7210b
 	pkgrel = 1
 	url = https://github.com/keeweb/keeweb
 	arch = any
@@ -20,7 +20,7 @@ pkgbase = keeweb-git
 	source = keeweb.sh
 	sha1sums = SKIP
 	sha1sums = a55c2ed276c6073b7954452cdc88209633d51ace
-	sha1sums = 3cad1556a5a855a3ab5152f1b2cb175287bd8368
+	sha1sums = f5ceba9e7c6c9d93c50279c524a286eca4d52804
 	sha1sums = a2ab033d06abfe7616d2615d8edf7931f29efc96
 
 pkgname = keeweb-git
diff --git a/PKGBUILD b/PKGBUILD
index 74e5998878d8..05e05c7c5ef8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor wenLiangcan <boxeed at gmail dot com>
 
 pkgname=keeweb-git
-pkgver=1.6.3+192+g9b9cda3
+pkgver=1.7.2+6+g0c7210b
 pkgrel=1
 pkgdesc="Desktop password manager compatible with KeePass databases. (develop branch)"
 arch=('any')
@@ -26,7 +26,7 @@ source=(
 
 sha1sums=('SKIP'
           'a55c2ed276c6073b7954452cdc88209633d51ace'
-          '3cad1556a5a855a3ab5152f1b2cb175287bd8368'
+          'f5ceba9e7c6c9d93c50279c524a286eca4d52804'
           'a2ab033d06abfe7616d2615d8edf7931f29efc96')
 
 pkgver() {
@@ -43,12 +43,13 @@ prepare() {
 	node ../package.json.patch.js
 
 	sed -i \
-		-e "/electronVersion/           d" \
-		-e "/loader: 'babel-loader'/,+2 d" \
-		-e "/loader: 'uglify-loader'/   d" \
+		-e "/const electronVersion/       s/pkg.dependencies.electron/'$(</usr/lib/electron/version)'/" \
+	Gruntfile.js
+
+	sed -i \
 		-e "/'eslint',/                 d" \
 		-e "/'uglify',/                 d" \
-	Gruntfile.js
+	grunt.tasks.js
 
 	sed -i \
 		-e '/Exec=/ c \Exec=keeweb %u' \
@@ -61,8 +62,11 @@ build() {
 	export SKIP_SASS_BINARY_DOWNLOAD_FOR_CI=1
 	export LIBSASS_EXT=auto
 
-	npm install --no-package-lock
-	node_modules/.bin/grunt --skip-sign build-web-app build-desktop-app-content
+	npm install
+
+	ln -fs normalize.css node_modules/normalize.css/normalize.scss
+
+	npx grunt build-web-app build-desktop-app-content
 
 	asar p tmp/desktop/app ../keeweb.asar
 }
diff --git a/package.json.patch.js b/package.json.patch.js
index 5617cc7ee617..45b103df1353 100644
--- a/package.json.patch.js
+++ b/package.json.patch.js
@@ -7,27 +7,20 @@ const data = JSON.parse(fs.readFileSync(PATCHABLE_FILE));
 
 // remove extra dependencies
 const removePkg = [
-	/^babel-/,
 	/^electron$/,
 	/^eslint/,
-	/^grunt-appdmg$/,
-	/^grunt-concurrent$/,
 	/^grunt-contrib-compress$/,
 	/^grunt-contrib-deb$/,
-	/^grunt-contrib-uglify$/,
 	/^grunt-contrib-watch$/,
+	/^grunt-contrib-uglify$/,
 	/^grunt-electron$/,
 	/^grunt-eslint$/,
-	/^uglify-loader$/,
 	/^webpack-dev-server/,
 ];
 
-Object.keys(data.devDependencies).forEach(dep => {
-	if (removePkg.some(reg => reg.test(dep)))
-		delete data.devDependencies[dep];
+Object.keys(data.dependencies).forEach(dep => {
+	if (removePkg.some(re => re.test(dep)))
+		delete data.dependencies[dep];
 });
 
-// upgrade node-sass
-data.devDependencies['node-sass'] = '^4.9.3';
-
-fs.writeFileSync(PATCHABLE_FILE, JSON.stringify(data, null, '\t'));
\ No newline at end of file
+fs.writeFileSync(PATCHABLE_FILE, JSON.stringify(data, null, '\t'));