Improved PKGBUILD syntax and updated dependencies

4 files changed, 22 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 40295b6c59e7..9cc438a7d772 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,16 @@
 pkgbase = mongodb-compass-readonly-beta
 	pkgdesc = The official GUI for MongoDB - Readonly Edition (beta version)
 	pkgver = 1.20.0beta.9
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.mongodb.com/products/compass
 	arch = x86_64
 	license = custom
-	depends = electron3
+	depends = electron3-bin
+	depends = krb5
 	depends = libsecret
-	optdepends = gnome-keyring
-	source = https://downloads.mongodb.com/compass/beta/mongodb-compass-readonly-beta-1.20.0-beta.9.x86_64.rpm
+	source = mongodb-compass-readonly-beta-1.20.0beta.9-2::https://downloads.mongodb.com/compass/beta/mongodb-compass-readonly-beta-1.20.0-beta.9.x86_64.rpm
 	source = launch.sh
 	sha256sums = da6df0f7738602f8a7c752a5d2503a61b10d7cee99066f9fdfc3e8286c557b5f
-	sha256sums = 3b624e8b0982ca1418da7b30bca2d52ccee22831de93d9c7b8f87a49791e8e73
+	sha256sums = 1bf3dd5e9363e750f4099acab9c8e22af7dc8645215d3fc4ed13abb0d38c5137
 
 pkgname = mongodb-compass-readonly-beta
-
diff --git a/.gitignore b/.gitignore
index c1a5245d7cfa..82b3c183d5d4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,5 +11,4 @@
 *.log.*
 *.sig
 
-pkg/
-src/
+*/
diff --git a/PKGBUILD b/PKGBUILD
index 35164ee79612..07ce2334a97f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,28 +1,25 @@
 # Maintainer: Daniel Peukert <dan.peukert@gmail.com>
 pkgname='mongodb-compass-readonly-beta'
 pkgver='1.20.0beta.9'
-pkgrel='1'
+pkgrel='2'
 pkgdesc='The official GUI for MongoDB - Readonly Edition (beta version)'
 arch=('x86_64')
 url='https://www.mongodb.com/products/compass'
 license=('custom')
-depends=('electron3' 'libsecret')
-optdepends=('gnome-keyring')
-source=(
-	'https://downloads.mongodb.com/compass/beta/mongodb-compass-readonly-beta-1.20.0-beta.9.x86_64.rpm'
-	'launch.sh'
-)
-sha256sums=(
-	'da6df0f7738602f8a7c752a5d2503a61b10d7cee99066f9fdfc3e8286c557b5f'
-	'3b624e8b0982ca1418da7b30bca2d52ccee22831de93d9c7b8f87a49791e8e73'
-)
+depends=('electron3-bin' 'krb5' 'libsecret')
+source=("$pkgname-$pkgver-$pkgrel::https://downloads.mongodb.com/compass/beta/mongodb-compass-readonly-beta-1.20.0-beta.9.x86_64.rpm"
+		'launch.sh')
+sha256sums=('da6df0f7738602f8a7c752a5d2503a61b10d7cee99066f9fdfc3e8286c557b5f'
+            '1bf3dd5e9363e750f4099acab9c8e22af7dc8645215d3fc4ed13abb0d38c5137')
 
 package() {
-	install -Dm644 "$srcdir/usr/share/mongodb-compass-readonly-beta/resources/app.asar" "$pkgdir/usr/lib/mongodb-compass-readonly-beta/app.asar"
-	cp -r "$srcdir/usr/share/mongodb-compass-readonly-beta/resources/app.asar.unpacked/" "$pkgdir/usr/lib/mongodb-compass-readonly-beta/app.asar.unpacked/"
-	install -Dm755 "$srcdir/launch.sh" "$pkgdir/usr/bin/mongodb-compass-readonly-beta"
-	install -Dm644 "$srcdir/usr/share/mongodb-compass-readonly-beta/LICENSE" "$pkgdir/usr/share/licenses/mongodb-compass-readonly-beta/LICENSE"
-	install -Dm644 "$srcdir/usr/share/mongodb-compass-readonly-beta/LICENSES.chromium.html" "$pkgdir/usr/share/licenses/mongodb-compass-readonly-beta/LICENSES.chromium.html"
-	install -Dm644 "$srcdir/usr/share/applications/mongodb-compass-readonly-beta.desktop" "$pkgdir/usr/share/applications/mongodb-compass-readonly-beta.desktop"
-	install -Dm644 "$srcdir/usr/share/pixmaps/mongodb-compass-readonly-beta.png" "$pkgdir/usr/share/pixmaps/mongodb-compass-readonly-beta.png"
+	cd "$srcdir/"
+	install -Dm644 "usr/share/$pkgname/resources/app.asar" "$pkgdir/usr/lib/$pkgname/app.asar"
+	install -dm755 "$pkgdir/usr/lib/$pkgname/app.asar.unpacked/"
+	cp -r --no-preserve=ownership --preserve=mode "usr/share/$pkgname/resources/app.asar.unpacked/"* "$pkgdir/usr/lib/$pkgname/app.asar.unpacked/"
+	install -Dm755 "launch.sh" "$pkgdir/usr/bin/$pkgname"
+	install -Dm644 "usr/share/$pkgname/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+	install -Dm644 "usr/share/$pkgname/LICENSES.chromium.html" "$pkgdir/usr/share/licenses/$pkgname/LICENSES.chromium.html"
+	install -Dm644 "usr/share/applications/$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop"
+	install -Dm644 "usr/share/pixmaps/$pkgname.png" "$pkgdir/usr/share/pixmaps/$pkgname.png"
 }
diff --git a/launch.sh b/launch.sh
index 25239adaee7d..020b276f4f9d 100644
--- a/launch.sh
+++ b/launch.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec electron3 '/usr/lib/mongodb-compass-readonly-beta/app.asar' "$@"
+exec electron3 "/usr/lib/$(basename "$0")/app.asar" "$@"