Fix mongodb-compass patch & change mongodb-compass-git version scheme

3 files changed, 14 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a282ab351067..3b122b3ecf1a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,8 @@
 pkgbase = mongodb-compass-readonly-git
 	pkgdesc = The official GUI for MongoDB - Readonly Edition - git version
-	pkgver = 1.24.0.r3346.g40bff9a4
+	pkgver = r3378.g2deb992e
 	pkgrel = 1
+	epoch = 1
 	url = https://www.mongodb.com/products/compass
 	arch = x86_64
 	arch = i686
@@ -22,6 +23,6 @@ pkgbase = mongodb-compass-readonly-git
 	source = mongodb-compass-readonly-git::git+https://github.com/mongodb-js/compass
 	source = hadron-build.diff
 	sha256sums = SKIP
-	sha256sums = 6adbd892ef2603c556e50b8f300fff87b5481dcec1b3ae741be0fbd250ad4c93
+	sha256sums = 559564c32e2b499d09b9c5b3badcaf64c88d89786d4542bb11bb36a26b5ca657
 
 pkgname = mongodb-compass-readonly-git
diff --git a/PKGBUILD b/PKGBUILD
index 531cad3af99d..ce8839685367 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,9 @@ _target='compass-readonly'
 _edition=' Readonly'
 _pkgname="mongodb-$_target"
 pkgname="$_pkgname-git"
-pkgver='1.24.0.r3346.g40bff9a4'
+pkgver='r3378.g2deb992e'
 pkgrel='1'
+epoch='1'
 pkgdesc='The official GUI for MongoDB - Readonly Edition - git version'
 arch=('x86_64' 'i686' 'armv7h' 'aarch64')
 url='https://www.mongodb.com/products/compass'
@@ -19,7 +20,7 @@ source=(
 	'hadron-build.diff'
 )
 sha256sums=('SKIP'
-            '6adbd892ef2603c556e50b8f300fff87b5481dcec1b3ae741be0fbd250ad4c93')
+            '559564c32e2b499d09b9c5b3badcaf64c88d89786d4542bb11bb36a26b5ca657')
 
 _sourcedirectory="$pkgname"
 _homedirectory="$pkgname-home"
@@ -28,10 +29,8 @@ prepare() {
 	cd "$srcdir/$_sourcedirectory/"
 
 	# Replace version in package.json
-	_origversion="$(sed -nE 's|.*"version": "(.*)".*|\1|p' 'package.json')"
-	_compassversion="$(echo "$_origversion" | cut -d '.' -f 1-2).$(git rev-list --count HEAD)"
-	_aurversion="$(echo "$_origversion" | cut -d '-' -f 1).r$(git rev-list --count HEAD).g$(git rev-parse --short HEAD)"
-	sed -E -i 's|"version": ".*",|"version": "'"$_compassversion"'",\n"_aurversion": "'"$_aurversion"'",|' 'package.json'
+	_compassversion="99.99.$(git rev-list --count HEAD)"
+	sed -E -i 's|"version": ".*",|"version": "'"$_compassversion"'",|' 'package.json'
 
 	# Loosen node version restriction
 	sed -E -i 's|("node": ").*"|\1'"$(node -v | sed 's/^v//')"'"|' 'package.json'
@@ -48,7 +47,7 @@ prepare() {
 
 pkgver() {
 	cd "$srcdir/$_sourcedirectory/"
-	sed -nE 's|.*"_aurversion": "(.*)".*|\1|p' 'package.json'
+	printf 'r%s.g%s' "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 build() {
diff --git a/hadron-build.diff b/hadron-build.diff
index d887e0b42886..2528a9377718 100644
--- a/hadron-build.diff
+++ b/hadron-build.diff
@@ -2,47 +2,24 @@ diff --git a/commands/release.js b/commands/release.js
 index fbbc423..cf85826 100644
 --- a/commands/release.js
 +++ b/commands/release.js
-@@ -566,9 +566,7 @@ exports.run = (argv, done) => {
-     task('create module cache', createModuleCache),
-     task('create packaged styles', createPackagedStyles),
-     task('remove development files', removeDevelopmentFiles),
+@@ -569,3 +569 @@ exports.run = (argv, done) => {
 -    task('create application asar', createApplicationAsar),
 -    task('create branded installer', createBrandedInstaller),
 -    task('create application zip', createApplicationZip)
 +    task('create application asar', createApplicationAsar)
-   ]);
- 
-   return async.series(tasks, (_err) => {
-@@ -582,9 +580,5 @@ exports.run = (argv, done) => {
- exports.handler = (argv) => {
-   exports.run(argv, (_err, CONFIG) => {
-     cli.abortIfError(_err);
+@@ -585,4 +582,0 @@ exports.handler = (argv) => {
 -    cli.ok(`${CONFIG.assets.length} assets successfully built`);
 -    CONFIG.assets.map(function(asset) {
 -      cli.info(asset.path);
 -    });
-   });
- };
 diff --git a/lib/target.js b/lib/target.js
-index 610546f..c4e151a 100644
+index 45b27f6..01b287e 100644
 --- a/lib/target.js
 +++ b/lib/target.js
-@@ -4,8 +4,6 @@ const semver = require('semver');
- const path = require('path');
- const normalizePkg = require('normalize-package-data');
- const parseGitHubRepoURL = require('parse-github-repo-url');
+@@ -7,2 +6,0 @@ const parseGitHubRepoURL = require('parse-github-repo-url');
 -const ffmpegAfterExtract = require('electron-packager-plugin-non-proprietary-codecs-ffmpeg')
 -  .default;
- const debug = require('debug')('hadron-build:target');
- 
- const notary = require('mongodb-notary-service-client');
-@@ -174,8 +172,7 @@ class Target {
-       platform: this.platform,
-       arch: this.arch,
-       electronVersion: this.electronVersion,
+@@ -178,2 +176 @@ class Target {
 -      sign: null,
 -      afterExtract: [ffmpegAfterExtract]
 +      sign: null
-     };
- 
-     if (this.platform === 'win32') {