Date: Wednesday, June 12, 2019 @ 20:54:35 Author: eschwartz Revision: 481105
upgpkg: keybase 4.1.0-1 upstream release ensure kbfs is started with the GUI make sure version number is recorded in electron app Modified: keybase/trunk/0001-Don-t-use-electron-to-build.patch keybase/trunk/PKGBUILD keybase/trunk/keybase-gui ----------------------------------------+ 0001-Don-t-use-electron-to-build.patch | 39 +++++++++++++++---------------- PKGBUILD | 16 ++++++------ keybase-gui | 2 - 3 files changed, 28 insertions(+), 29 deletions(-) Modified: 0001-Don-t-use-electron-to-build.patch =================================================================== --- 0001-Don-t-use-electron-to-build.patch 2019-06-12 20:38:45 UTC (rev 481104) +++ 0001-Don-t-use-electron-to-build.patch 2019-06-12 20:54:35 UTC (rev 481105) @@ -1,19 +1,19 @@ -From cadd633aeee4600dd1a9aee9a626a16a8e8afd5e Mon Sep 17 00:00:00 2001 +From d6253b384dac53b05ce2f7dbe2434fe316637643 Mon Sep 17 00:00:00 2001 From: Eli Schwartz <[email protected]> Date: Thu, 21 Jun 2018 05:00:37 -0400 Subject: [PATCH] Don't use electron to build --- - shared/desktop/package.desktop.js | 4 ++-- - shared/desktop/yarn-helper/index.js | 2 -- - shared/package.json | 1 - + shared/desktop/package.desktop.tsx | 4 ++-- + shared/desktop/yarn-helper/index.tsx | 2 -- + shared/package.json | 1 - 3 files changed, 2 insertions(+), 5 deletions(-) -diff --git a/shared/desktop/package.desktop.js b/shared/desktop/package.desktop.js -index 45c11f5564..dbb6fe7516 100644 ---- a/shared/desktop/package.desktop.js -+++ b/shared/desktop/package.desktop.js -@@ -86,7 +86,7 @@ function main() { +diff --git a/shared/desktop/package.desktop.tsx b/shared/desktop/package.desktop.tsx +index 1eb98741f0..980636c31e 100644 +--- a/shared/desktop/package.desktop.tsx ++++ b/shared/desktop/package.desktop.tsx +@@ -85,7 +85,7 @@ function main() { // use the same version as the currently-installed electron console.log('Finding electron version') try { @@ -22,7 +22,7 @@ console.log('Found electron version:', packagerOpts.electronVersion) } catch (err) { console.log("Couldn't parse yarn list to find electron:", err) -@@ -136,7 +136,7 @@ function startPack() { +@@ -133,7 +133,7 @@ function startPack() { .catch(postPackError) }) }) @@ -31,12 +31,11 @@ pack(platform, arch) .then(postPack(platform, arch)) .catch(postPackError) -diff --git a/shared/desktop/yarn-helper/index.js b/shared/desktop/yarn-helper/index.js -index 425346cbb7..29d1ee6b54 100644 ---- a/shared/desktop/yarn-helper/index.js -+++ b/shared/desktop/yarn-helper/index.js -@@ -1,7 +1,6 @@ - // @flow +diff --git a/shared/desktop/yarn-helper/index.tsx b/shared/desktop/yarn-helper/index.tsx +index 50b2cdc4f7..3cea627bff 100644 +--- a/shared/desktop/yarn-helper/index.tsx ++++ b/shared/desktop/yarn-helper/index.tsx +@@ -1,6 +1,5 @@ // Helper for cross platform yarn run script commands import buildCommands from './build' -import electronComands from './electron' @@ -43,7 +42,7 @@ import fontCommands from './font' import prettierCommands from './prettier' import {execSync} from 'child_process' -@@ -13,7 +12,6 @@ const [, , command, ...rest] = process.argv +@@ -12,7 +11,6 @@ const [, , command, ...rest] = process.argv const commands = { ...buildCommands, ...fontCommands, @@ -52,10 +51,10 @@ help: { code: () => { diff --git a/shared/package.json b/shared/package.json -index 128aaf68d0..9490ca5c08 100644 +index 49b17665d9..b51da021f0 100644 --- a/shared/package.json +++ b/shared/package.json -@@ -212,7 +212,6 @@ +@@ -238,7 +238,6 @@ "cross-env": "5.2.0", "css-loader": "2.1.0", "del": "3.0.0", @@ -64,5 +63,5 @@ "eslint": "5.12.0", "eslint-config-standard": "12.0.0", -- -2.21.0 +2.22.0 Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-06-12 20:38:45 UTC (rev 481104) +++ PKGBUILD 2019-06-12 20:54:35 UTC (rev 481105) @@ -5,7 +5,7 @@ pkgbase=keybase pkgname=('keybase' 'kbfs' 'keybase-gui') pkgdesc='CLI tool for GPG with keybase.io' -pkgver=4.0.0 +pkgver=4.1.0 pkgrel=1 arch=('x86_64') url='https://keybase.io/' @@ -15,12 +15,12 @@ source=("${pkgbase}-${pkgver}.tar.gz::https://github.com/keybase/client/archive/v${pkgver}.tar.gz"; "keybase-gui" "0001-Don-t-use-electron-to-build.patch") -sha512sums=('b572cd747b8a5b94764671903de1e5e0641a7e1b58ff8eff1058143fd8962fa0685f4aa378d23690d50ee4dd756fc38afdc747c0f2e3266bf4bad93808144331' - '72d2a5ba25d2f5898fa7e97cee655aacfdca50933000555f6c04451235ad7f6d08a3ee2ec94cac79130064b9702fd38d24abffc48187e19912acd01d378156e3' - 'df19e24912a26ff0a745493d4f90839aae9d6b7efff6d95e38efb079b6f5028ceca4e9e339eaf8069d0a678505ad472869e1d1a0c02558087b40296cacf4381f') -b2sums=('63e754fb8748f5196f9a0044b61e6c1f269ef541a09f24eb401505c4e85f38bbc9eb8f88497d0d2271680d772dd08637ef07db466b2894a4e4a6d3388b55931e' - '3b1cdc95a70c9463c8ab2506cc22577ff5b9fd9665a99fcb97c287590f89cef4450fa984e58548288c7e2f2411de00577b92b78ac38829eac5d86223ceb432a0' - '0f3bc76093afd54a7e360873de71e6446a00878c014d6a3acb3786dc7336ddf5956785a3d14b57541e604eba1e2acd9e4771a21c0684ed7fbe1106c4492fafd8') +sha512sums=('da018ca7c2c01ddcb86e0cb6bd34ab252e4495605519cadd6a521a52fed4931cf2bbafd83cb3b009239eab4de917b8c6f9a06a230e85f2d44cf47b265e0d5afe' + '673bfd68c708a905f1a69835804166945ef1be46de367f35b841015be1cc9b0cb188367055f147028ca12b3f464d877e0d502d24a4e6a6d94423f6f1cfc4b26a' + 'f552e40479fd7240ce671cf1b36a92df89ad93c1505322ad53a7d2c2f1e961e22bc5f6147f09a7ccf4f50594bff6ea400d32152c67dd8223d6c2b73be5efdbb2') +b2sums=('8e14a94f80ea9a3b3e98d0e53ee1a213277747287772579364e24306d6163fe5302e407e4fd1f9363409173d4c65a338251596ce9e502f3bebe781ef5e711d83' + 'd2392b0d61279358a4063b4df872e96545672d70b8b99c23f29ec26ab7d96467dbf25c4066319e0ff214d069418a745e370400f6a3923b458d89b37883995db5' + 'cb04645501fb475b6c3d1ec4b6ca43b7e8fa929a774093b50f3dc6c6e57866d6064e648854bfea0d04719dae62045da8a260b0ca4c2a15e82898e07dfe7cad95') prepare() { cd client-${pkgver} @@ -51,7 +51,7 @@ cd ../../shared yarn install - yarn run package + yarn run package --appVersion $pkgver } package_keybase() { Modified: keybase-gui =================================================================== --- keybase-gui 2019-06-12 20:38:45 UTC (rev 481104) +++ keybase-gui 2019-06-12 20:54:35 UTC (rev 481105) @@ -1,4 +1,4 @@ #!/bin/sh systemctl --user import-environment KEYBASE_AUTOSTART -keybase ctl init && exec systemctl start --user --wait keybase.gui.service +keybase ctl init && exec systemctl start --user --wait keybase kbfs keybase.gui
