[arch-commits] Commit in keybase/repos/community-x86_64 (8 files)

Eli Schwartz eschwartz at archlinux.org
Fri Apr 24 23:27:10 UTC 2020


    Date: Friday, April 24, 2020 @ 23:27:09
  Author: eschwartz
Revision: 619632

archrelease: copy trunk to community-x86_64

Added:
  keybase/repos/community-x86_64/0001-Don-t-use-electron-to-build.patch
    (from rev 619631, keybase/trunk/0001-Don-t-use-electron-to-build.patch)
  keybase/repos/community-x86_64/PKGBUILD
    (from rev 619631, keybase/trunk/PKGBUILD)
  keybase/repos/community-x86_64/kbfs.install
    (from rev 619631, keybase/trunk/kbfs.install)
  keybase/repos/community-x86_64/keybase-gui
    (from rev 619631, keybase/trunk/keybase-gui)
Deleted:
  keybase/repos/community-x86_64/0001-Don-t-use-electron-to-build.patch
  keybase/repos/community-x86_64/PKGBUILD
  keybase/repos/community-x86_64/kbfs.install
  keybase/repos/community-x86_64/keybase-gui

----------------------------------------+
 0001-Don-t-use-electron-to-build.patch |  134 ++++++++--------
 PKGBUILD                               |  248 +++++++++++++++----------------
 kbfs.install                           |   30 +--
 keybase-gui                            |   22 +-
 4 files changed, 217 insertions(+), 217 deletions(-)

Deleted: 0001-Don-t-use-electron-to-build.patch
===================================================================
--- 0001-Don-t-use-electron-to-build.patch	2020-04-24 23:26:45 UTC (rev 619631)
+++ 0001-Don-t-use-electron-to-build.patch	2020-04-24 23:27:09 UTC (rev 619632)
@@ -1,67 +0,0 @@
-From 7b4316eda537174fb8726d02c64584fa9d2b5650 Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwartz93 at gmail.com>
-Date: Thu, 21 Jun 2018 05:00:37 -0400
-Subject: [PATCH] Don't use electron to build
-
----
- 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.tsx b/shared/desktop/package.desktop.tsx
-index b10bb10295..f4b5fc3e6a 100644
---- a/shared/desktop/package.desktop.tsx
-+++ b/shared/desktop/package.desktop.tsx
-@@ -133,7 +133,7 @@ function main() {
-   // use the same version as the currently-installed electron
-   console.log('Finding electron version')
-   try {
--    packagerOpts.electronVersion = require('../package.json').devDependencies.electron
-+    packagerOpts.electronVersion = 'unused string'
-     console.log('Found electron version:', packagerOpts.electronVersion)
-   } catch (err) {
-     console.log("Couldn't parse yarn list to find electron:", err)
-@@ -181,7 +181,7 @@ function startPack() {
-                 .catch(postPackError)
-             })
-           })
--        } else {
-+        } else if (false) {
-           pack(platform, arch)
-             .then(postPack(platform, arch))
-             .catch(postPackError)
-diff --git a/shared/desktop/yarn-helper/index.tsx b/shared/desktop/yarn-helper/index.tsx
-index b80018f9f9..30f26606b4 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'
- import fontCommands from './font'
- import prettierCommands from './prettier'
- import {execSync} from 'child_process'
-@@ -14,7 +13,6 @@ const [, , command, ...rest] = process.argv
- const commands = {
-   ...buildCommands,
-   ...fontCommands,
--  ...electronComands,
-   ...prettierCommands,
-   help: {
-     code: () => {
-diff --git a/shared/package.json b/shared/package.json
-index 373f43440e..14deb7fd99 100644
---- a/shared/package.json
-+++ b/shared/package.json
-@@ -201,7 +201,6 @@
-     "cross-env": "5.2.0",
-     "css-loader": "3.2.0",
-     "del": "3.0.0",
--    "electron": "8.0.2",
-     "electron-packager": "14.0.6",
-     "eslint": "6.4.0",
-     "eslint-plugin-filenames": "1.3.2",
--- 
-2.25.1
-

Copied: keybase/repos/community-x86_64/0001-Don-t-use-electron-to-build.patch (from rev 619631, keybase/trunk/0001-Don-t-use-electron-to-build.patch)
===================================================================
--- 0001-Don-t-use-electron-to-build.patch	                        (rev 0)
+++ 0001-Don-t-use-electron-to-build.patch	2020-04-24 23:27:09 UTC (rev 619632)
@@ -0,0 +1,67 @@
+From 7b4316eda537174fb8726d02c64584fa9d2b5650 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz93 at gmail.com>
+Date: Thu, 21 Jun 2018 05:00:37 -0400
+Subject: [PATCH] Don't use electron to build
+
+---
+ 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.tsx b/shared/desktop/package.desktop.tsx
+index b10bb10295..f4b5fc3e6a 100644
+--- a/shared/desktop/package.desktop.tsx
++++ b/shared/desktop/package.desktop.tsx
+@@ -133,7 +133,7 @@ function main() {
+   // use the same version as the currently-installed electron
+   console.log('Finding electron version')
+   try {
+-    packagerOpts.electronVersion = require('../package.json').devDependencies.electron
++    packagerOpts.electronVersion = 'unused string'
+     console.log('Found electron version:', packagerOpts.electronVersion)
+   } catch (err) {
+     console.log("Couldn't parse yarn list to find electron:", err)
+@@ -181,7 +181,7 @@ function startPack() {
+                 .catch(postPackError)
+             })
+           })
+-        } else {
++        } else if (false) {
+           pack(platform, arch)
+             .then(postPack(platform, arch))
+             .catch(postPackError)
+diff --git a/shared/desktop/yarn-helper/index.tsx b/shared/desktop/yarn-helper/index.tsx
+index b80018f9f9..30f26606b4 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'
+ import fontCommands from './font'
+ import prettierCommands from './prettier'
+ import {execSync} from 'child_process'
+@@ -14,7 +13,6 @@ const [, , command, ...rest] = process.argv
+ const commands = {
+   ...buildCommands,
+   ...fontCommands,
+-  ...electronComands,
+   ...prettierCommands,
+   help: {
+     code: () => {
+diff --git a/shared/package.json b/shared/package.json
+index 373f43440e..14deb7fd99 100644
+--- a/shared/package.json
++++ b/shared/package.json
+@@ -201,7 +201,6 @@
+     "cross-env": "5.2.0",
+     "css-loader": "3.2.0",
+     "del": "3.0.0",
+-    "electron": "8.0.2",
+     "electron-packager": "14.0.6",
+     "eslint": "6.4.0",
+     "eslint-plugin-filenames": "1.3.2",
+-- 
+2.25.1
+

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-04-24 23:26:45 UTC (rev 619631)
+++ PKGBUILD	2020-04-24 23:27:09 UTC (rev 619632)
@@ -1,124 +0,0 @@
-# Maintainer: Eli Schwartz <eschwartz at archlinux.org>
-# Contributor: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Michael Hansen <zrax0111 gmail com>
-
-pkgbase=keybase
-pkgname=('keybase' 'kbfs' 'keybase-gui')
-pkgdesc='CLI tool for GPG with keybase.io'
-pkgver=5.4.0
-pkgrel=1
-arch=('x86_64')
-url='https://keybase.io/'
-license=('BSD')
-# git is needed for yarn...
-makedepends=('git' 'go-pie' 'yarn')
-source=("https://github.com/keybase/client/releases/download/v${pkgver}/${pkgbase}-v${pkgver}.tar.xz"{,.sig}
-        "keybase-gui"
-        "0001-Don-t-use-electron-to-build.patch")
-sha512sums=('5b0ae52a38fb9ce84a4d5fb53ad0824f03be0f1a8f0b86c4e4e07bf07e814d2accf46fd1a9b0001db5a331866b5414f7d1c59ae7f3ee13348fe97079acf6f883'
-            'SKIP'
-            'd672bdd308b2ab6f7b1248300f85f11b480e08149e1e4da5e01dac6c551b44dbfceb5c89d0fd17ce7a64c8b83cd4c7df14e24c31c2f37ae532abbb9099320290'
-            '1485e41432218b88aff71bbe68d265baad18c8b91b3d51cacdb4ac9b09abfb6cde91b9b87cb861cffeff92830159552307a89462c8697bb066416bd897e7b68b')
-b2sums=('d11f94ef3ee769701d590f8a1ee44d1221cc0d1825aff3fbbb4b7c55bee692ecd4b8b15439d1197a9b17f98661f19c4b53fe1daa73d26fa437003303033498e6'
-        'SKIP'
-        'db6d63df77aa73c230128b5c6cd278215e0dfac2b42db861127571a6c867d8a305c18a5ea12a616669c77bd072ab8b26aa52379cbd8167c34bc043bfdcefec1d'
-        '164dd6f37fe38d3c840b2b92d41553e0be67985d7c8471833a9ff381c05b0c35f295bfc630aa3ce6e31afb70b805d071e8c0a438a504064d24f99720c1571b9a')
-validpgpkeys=('222B85B0F90BE2D24CFEB93F47484E50656D16C7') # Keybase.io Code Signing (v1) <code at keybase.io>
-
-prepare() {
-    cd client-v${pkgver}
-
-    export GOPATH="${srcdir}/.gopath"
-    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).
-    # Also wire up "hideWindow" when running as a service or via XDG autostart.
-    sed -i 's@/opt/keybase/Keybase@/usr/bin/electron /usr/share/keybase-app@' \
-        packaging/linux/systemd/keybase.gui.service
-    sed -i '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
-}
-
-build() {
-    cd client-v${pkgver}/go/keybase
-
-    export GOPATH="${srcdir}/.gopath"
-    # 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
-    yarn run package --appVersion $pkgver
-}
-
-package_keybase() {
-    depends=('gnupg')
-    optdepends=('kbfs: for the fuse-based fileystem and the encryption subcommand')
-
-    cd client-v${pkgver}
-
-    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
-    # systemd activation
-    install -Dm644 packaging/linux/systemd/keybase.service "${pkgdir}"/usr/lib/systemd/user/keybase.service
-    install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}
-
-package_kbfs() {
-    pkgdesc="The Keybase filesystem"
-    url="https://keybase.io/docs/kbfs"
-    depends=('fuse' 'keybase')
-    install=kbfs.install
-
-    cd client-v${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 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')
-
-    cd client-v${pkgver}/
-
-    install -Dm644 packaging/linux/x-saltpack.xml \
-        "${pkgdir}"/usr/share/mime/packages/x-saltpack.xml
-    install -Dm644 packaging/linux/keybase.desktop \
-        "${pkgdir}"/usr/share/applications/keybase.desktop
-    # more systemd activation
-    install -Dm644 packaging/linux/systemd/keybase.gui.service \
-        "${pkgdir}"/usr/lib/systemd/user/keybase.gui.service
-    # wrapper for electron
-    install -Dm755 "${srcdir}"/keybase-gui "${pkgdir}"/usr/bin/keybase-gui
-
-    install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-
-    for i in 16 32 128 256 512 ; do
-        install -Dm644 media/icons/Keybase.iconset/icon_${i}x${i}.png \
-            "${pkgdir}"/usr/share/icons/hicolor/${i}x${i}/apps/keybase.png
-        install -Dm644 media/icons/Saltpack.iconset/icon_${i}x${i}.png \
-            "${pkgdir}"/usr/share/icons/hicolor/${i}x${i}/mimetypes/application-x-saltpack.png
-    done
-    # ???
-    install -Dm644 media/icons/Keybase.iconset/icon_32x32 at 2x.png \
-        "${pkgdir}"/usr/share/icons/hicolor/64x64/apps/keybase.png
-    install -Dm644 media/icons/Keybase.iconset/icon_512x512 at 2x.png \
-        "${pkgdir}"/usr/share/icons/hicolor/1024x1024/apps/keybase.png
-
-    # the app itself
-    cd shared/desktop/build
-    rm -rf desktop/sourcemaps/
-    mkdir -p "${pkgdir}"/usr/share/keybase-app
-    cp -r * "${pkgdir}"/usr/share/keybase-app/
-}

Copied: keybase/repos/community-x86_64/PKGBUILD (from rev 619631, keybase/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-04-24 23:27:09 UTC (rev 619632)
@@ -0,0 +1,124 @@
+# Maintainer: Eli Schwartz <eschwartz at archlinux.org>
+# Contributor: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Michael Hansen <zrax0111 gmail com>
+
+pkgbase=keybase
+pkgname=('keybase' 'kbfs' 'keybase-gui')
+pkgdesc='CLI tool for GPG with keybase.io'
+pkgver=5.4.2
+pkgrel=1
+arch=('x86_64')
+url='https://keybase.io/'
+license=('BSD')
+# git is needed for yarn...
+makedepends=('git' 'go-pie' 'yarn')
+source=("https://github.com/keybase/client/releases/download/v${pkgver}/${pkgbase}-v${pkgver}.tar.xz"{,.sig}
+        "keybase-gui"
+        "0001-Don-t-use-electron-to-build.patch")
+sha512sums=('81c90a924dd27eeb0f9f264e729a0d047f9057949eebb42aec85f97fbb34627e07e23a3737fb419041de891126ccba2f0de55e5a37994ab96c46a7120ca25c21'
+            'SKIP'
+            'd672bdd308b2ab6f7b1248300f85f11b480e08149e1e4da5e01dac6c551b44dbfceb5c89d0fd17ce7a64c8b83cd4c7df14e24c31c2f37ae532abbb9099320290'
+            '1485e41432218b88aff71bbe68d265baad18c8b91b3d51cacdb4ac9b09abfb6cde91b9b87cb861cffeff92830159552307a89462c8697bb066416bd897e7b68b')
+b2sums=('f3d9850c0dcc70e4111d131561df6f89188da261f0cb0ca78f36d9a3277c61c001e2ddcf73f25c44fcdb866a0060a6f8f4325b2fd5dd5fcc0dc4202194ea5f8f'
+        'SKIP'
+        'db6d63df77aa73c230128b5c6cd278215e0dfac2b42db861127571a6c867d8a305c18a5ea12a616669c77bd072ab8b26aa52379cbd8167c34bc043bfdcefec1d'
+        '164dd6f37fe38d3c840b2b92d41553e0be67985d7c8471833a9ff381c05b0c35f295bfc630aa3ce6e31afb70b805d071e8c0a438a504064d24f99720c1571b9a')
+validpgpkeys=('222B85B0F90BE2D24CFEB93F47484E50656D16C7') # Keybase.io Code Signing (v1) <code at keybase.io>
+
+prepare() {
+    cd client-v${pkgver}
+
+    export GOPATH="${srcdir}/.gopath"
+    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).
+    # Also wire up "hideWindow" when running as a service or via XDG autostart.
+    sed -i 's@/opt/keybase/Keybase@/usr/bin/electron /usr/share/keybase-app@' \
+        packaging/linux/systemd/keybase.gui.service
+    sed -i '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
+}
+
+build() {
+    cd client-v${pkgver}/go/keybase
+
+    export GOPATH="${srcdir}/.gopath"
+    # 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
+    yarn run package --appVersion $pkgver
+}
+
+package_keybase() {
+    depends=('gnupg')
+    optdepends=('kbfs: for the fuse-based fileystem and the encryption subcommand')
+
+    cd client-v${pkgver}
+
+    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
+    # systemd activation
+    install -Dm644 packaging/linux/systemd/keybase.service "${pkgdir}"/usr/lib/systemd/user/keybase.service
+    install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+}
+
+package_kbfs() {
+    pkgdesc="The Keybase filesystem"
+    url="https://keybase.io/docs/kbfs"
+    depends=('fuse' 'keybase')
+    install=kbfs.install
+
+    cd client-v${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 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')
+
+    cd client-v${pkgver}/
+
+    install -Dm644 packaging/linux/x-saltpack.xml \
+        "${pkgdir}"/usr/share/mime/packages/x-saltpack.xml
+    install -Dm644 packaging/linux/keybase.desktop \
+        "${pkgdir}"/usr/share/applications/keybase.desktop
+    # more systemd activation
+    install -Dm644 packaging/linux/systemd/keybase.gui.service \
+        "${pkgdir}"/usr/lib/systemd/user/keybase.gui.service
+    # wrapper for electron
+    install -Dm755 "${srcdir}"/keybase-gui "${pkgdir}"/usr/bin/keybase-gui
+
+    install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+
+    for i in 16 32 128 256 512 ; do
+        install -Dm644 media/icons/Keybase.iconset/icon_${i}x${i}.png \
+            "${pkgdir}"/usr/share/icons/hicolor/${i}x${i}/apps/keybase.png
+        install -Dm644 media/icons/Saltpack.iconset/icon_${i}x${i}.png \
+            "${pkgdir}"/usr/share/icons/hicolor/${i}x${i}/mimetypes/application-x-saltpack.png
+    done
+    # ???
+    install -Dm644 media/icons/Keybase.iconset/icon_32x32 at 2x.png \
+        "${pkgdir}"/usr/share/icons/hicolor/64x64/apps/keybase.png
+    install -Dm644 media/icons/Keybase.iconset/icon_512x512 at 2x.png \
+        "${pkgdir}"/usr/share/icons/hicolor/1024x1024/apps/keybase.png
+
+    # the app itself
+    cd shared/desktop/build
+    rm -rf desktop/sourcemaps/
+    mkdir -p "${pkgdir}"/usr/share/keybase-app
+    cp -r * "${pkgdir}"/usr/share/keybase-app/
+}

Deleted: kbfs.install
===================================================================
--- kbfs.install	2020-04-24 23:26:45 UTC (rev 619631)
+++ kbfs.install	2020-04-24 23:27:09 UTC (rev 619632)
@@ -1,15 +0,0 @@
-post_install() {
-    cat << '__EOF__'
-warning: the keybase-redirector is not included, so you will need to define
-your `keybase config` mountdir to something you like (or install the
-redirector on your own).
-
-See: https://github.com/keybase/client/issues/19840#issuecomment-533842074
-__EOF__
-}
-
-post_upgrade() {
-    if (( $(vercmp 4.7.1-1 $2) > 0 )); then
-        post_install
-    fi
-}

Copied: keybase/repos/community-x86_64/kbfs.install (from rev 619631, keybase/trunk/kbfs.install)
===================================================================
--- kbfs.install	                        (rev 0)
+++ kbfs.install	2020-04-24 23:27:09 UTC (rev 619632)
@@ -0,0 +1,15 @@
+post_install() {
+    cat << '__EOF__'
+warning: the keybase-redirector is not included, so you will need to define
+your `keybase config` mountdir to something you like (or install the
+redirector on your own).
+
+See: https://github.com/keybase/client/issues/19840#issuecomment-533842074
+__EOF__
+}
+
+post_upgrade() {
+    if (( $(vercmp 4.7.1-1 $2) > 0 )); then
+        post_install
+    fi
+}

Deleted: keybase-gui
===================================================================
--- keybase-gui	2020-04-24 23:26:45 UTC (rev 619631)
+++ keybase-gui	2020-04-24 23:27:09 UTC (rev 619632)
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-keybase ctl init
-systemctl start --user keybase kbfs
-
-if [ $# -gt 0 ] || systemctl --user is-active --quiet keybase.gui; then
-    exec electron /usr/share/keybase-app "$@"
-else
-    systemctl --user import-environment KEYBASE_AUTOSTART
-    exec systemctl start --user --wait keybase.gui
-fi

Copied: keybase/repos/community-x86_64/keybase-gui (from rev 619631, keybase/trunk/keybase-gui)
===================================================================
--- keybase-gui	                        (rev 0)
+++ keybase-gui	2020-04-24 23:27:09 UTC (rev 619632)
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+keybase ctl init
+systemctl start --user keybase kbfs
+
+if [ $# -gt 0 ] || systemctl --user is-active --quiet keybase.gui; then
+    exec electron /usr/share/keybase-app "$@"
+else
+    systemctl --user import-environment KEYBASE_AUTOSTART
+    exec systemctl start --user --wait keybase.gui
+fi



More information about the arch-commits mailing list