Date: Tuesday, January 22, 2019 @ 03:26:44 Author: eschwartz Revision: 426778
upgpkg: keybase 2.13.1-1 upstream release kbfs merged into main repository; now part of unified split PKGBUILD rework electron wrapper script for better hideWindow handling 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 | 20 ++++++++--------- PKGBUILD | 36 +++++++++++++++++++++++-------- keybase-gui | 8 ++++++ 3 files changed, 44 insertions(+), 20 deletions(-) Modified: 0001-Don-t-use-electron-to-build.patch =================================================================== --- 0001-Don-t-use-electron-to-build.patch 2019-01-22 03:25:19 UTC (rev 426777) +++ 0001-Don-t-use-electron-to-build.patch 2019-01-22 03:26:44 UTC (rev 426778) @@ -1,4 +1,4 @@ -From b53e21bbff9bc10f5d83059746b8ec1338a68bc0 Mon Sep 17 00:00:00 2001 +From 8149b6244c6b9043b5e8fa391a453c2484582ba7 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 @@ -32,7 +32,7 @@ .then(postPack(platform, arch)) .catch(postPackError) diff --git a/shared/desktop/yarn-helper/index.js b/shared/desktop/yarn-helper/index.js -index a0a28b3fda..7ed3c84e2f 100644 +index 425346cbb7..29d1ee6b54 100644 --- a/shared/desktop/yarn-helper/index.js +++ b/shared/desktop/yarn-helper/index.js @@ -1,7 +1,6 @@ @@ -43,7 +43,7 @@ import fontCommands from './font' import prettierCommands from './prettier' import {execSync} from 'child_process' -@@ -11,7 +10,6 @@ const [, , command, ...rest] = process.argv +@@ -13,7 +12,6 @@ const [, , command, ...rest] = process.argv const commands = { ...buildCommands, ...fontCommands, @@ -52,17 +52,17 @@ help: { code: () => { diff --git a/shared/package.json b/shared/package.json -index 5426fee0e5..3c1182ee0e 100644 +index 09e8732402..fdcc2f9c9c 100644 --- a/shared/package.json +++ b/shared/package.json -@@ -203,7 +203,6 @@ +@@ -204,7 +204,6 @@ "cross-env": "5.2.0", - "css-loader": "1.0.1", + "css-loader": "2.1.0", "del": "3.0.0", -- "electron": "3.0.10", - "electron-packager": "12.2.0", - "eslint": "5.9.0", +- "electron": "4.0.1", + "electron-packager": "13.0.1", + "eslint": "5.12.0", "eslint-config-standard": "12.0.0", -- -2.19.2 +2.20.1 Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-01-22 03:25:19 UTC (rev 426777) +++ PKGBUILD 2019-01-22 03:26:44 UTC (rev 426778) @@ -3,9 +3,9 @@ # Contributor: Michael Hansen <zrax0111 gmail com> pkgbase=keybase -pkgname=('keybase' 'keybase-gui') +pkgname=('keybase' 'kbfs' 'keybase-gui') pkgdesc='CLI tool for GPG with keybase.io' -pkgver=2.11.0 +pkgver=2.13.1 pkgrel=1 arch=('x86_64') url='https://keybase.io/' @@ -15,9 +15,9 @@ source=("${pkgname}-${pkgver}.tar.gz::https://github.com/keybase/client/archive/v${pkgver}.tar.gz"; "keybase-gui" "0001-Don-t-use-electron-to-build.patch") -sha512sums=('b150184e692c81243a8f83b828ec8ef4f6b324a6cbd0b1cb9cf5e89eebbec7a6183a2af3b8d26c663ab677aa38753c328e190b46035c3815af8373d8ff4b26fa' - 'b3086ea6c60950284eecc331a8a648ea557f89f686f2adecb82b22d0ac65381683fbcc84875a48cf6ba9e3c63d4f06c73b84175621dca5e8f03b2a6a88cdcad4' - 'e43f9d881bf1b6e29c7158308d3406e0e0f01d435d91bc934d476424041ad07727357206b2e9298cfbe3c7f48a16dfbe30eb6304686ecf556272c6c7790cea10') +sha512sums=('c0cad522f14cf39f08c841ff90f96662f3f5d9fe3c8e8156755a8805757c5d206991410a2511315b8c00dcafcc5e23e5449d37d13f399e6692e0c6d4fb1c0b61' + '4ab159d8e764de7ef92b3c9b99559e0a499de607914521b7c5f89396d810c6360b87a785c43be90c54d1dee7e93ec1fda31e8377080d9bbbeb6230166d856f39' + 'b721dc0c40cf23602424d2ca024524a0eef5210a7cdca0209b89eab5c17c3fcb3cc48d91940a4c88d2416d0a19a7fb3deba92e90244251c4338b0fd640befdcd') prepare() { cd client-${pkgver} @@ -26,10 +26,13 @@ mkdir -p "${GOPATH}"/src/github.com/keybase ln -sf "${PWD}" "${GOPATH}"/src/github.com/keybase/client - # Fix paths to run electron /path/to/app (or our minimal wrapper script) - sed -i 's@/opt/keybase/Keybase@/usr/bin/electron /usr/share/keybase-app@' \ + # Fix paths to run electron /path/to/app (or our minimal wrapper script). + # Also wire up "hideWindow" when running as a service or via XDG autostart. + sed -i \ + -e 's@/opt/keybase/Keybase@/usr/bin/electron /usr/share/keybase-app@' \ + -e '/EnvironmentFile/a\Environment=KEYBASE_START_UI=hideWindow' \ packaging/linux/systemd/keybase.gui.service - sed -i 's/run_keybase/keybase-gui/g' \ + sed -i 's/KEYBASE_AUTOSTART=1/KEYBASE_START_UI=hideWindow/;s/run_keybase/keybase-gui/g' \ packaging/linux/keybase.desktop go/install/install_unix.go patch -p1 -i ../0001-Don-t-use-electron-to-build.patch @@ -42,6 +45,8 @@ # go build -a -tags production -gccgoflags "$CFLAGS $LDFLAGS" github.com/keybase/client/go/keybase go build -a -tags production -o ../bin/keybase github.com/keybase/client/go/keybase go build -a -tags production -o ../bin/kbnm github.com/keybase/client/go/kbnm + go build -a -tags production -o ../bin/kbfsfuse github.com/keybase/client/go/kbfs/kbfsfuse + go build -a -tags production -o ../bin/git-remote-keybase github.com/keybase/client/go/kbfs/kbfsgit/git-remote-keybase cd ../../shared yarn install @@ -54,7 +59,7 @@ cd client-${pkgver} - install -Dm755 -t "${pkgdir}"/usr/bin/ go/bin/* + install -Dm755 -t "${pkgdir}"/usr/bin/ go/bin/{keybase,kbnm} # native messaging whitelists KBNM_INSTALL_ROOT=1 KBNM_INSTALL_OVERLAY="${pkgdir}" "${pkgdir}/usr/bin/kbnm" install @@ -63,6 +68,19 @@ install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE } +package_kbfs() { + pkgdesc="The Keybase filesystem" + url="https://keybase.io/docs/kbfs"; + depends=('fuse' 'keybase') + + cd client-${pkgver} + + install -Dm755 -t "${pkgdir}"/usr/bin/ go/bin/{kbfsfuse,git-remote-keybase} + install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE + # more systemd activation + install -Dm644 go/kbfs/packaging/linux/systemd/kbfs.service "$pkgdir"/usr/lib/systemd/user/kbfs.service +} + package_keybase-gui() { pkgdesc="GUI frontend for GPG with keybase.io" depends=('electron' 'keybase' 'kbfs') Modified: keybase-gui =================================================================== --- keybase-gui 2019-01-22 03:25:19 UTC (rev 426777) +++ keybase-gui 2019-01-22 03:26:44 UTC (rev 426778) @@ -1,4 +1,10 @@ #!/bin/sh +systemctl start --user keybase.service kbfs.service systemctl start --user keybase.gui.service -exec electron /usr/share/keybase-app/ "$@" + +# executing the application when it is already running will bring it to the +# foreground +if [ "$KEYBASE_START_UI" != 'hideWindow' ]; then + exec electron /usr/share/keybase-app/ "$@" +fi
