From 972b0c2888674a3f8dd641e117b36a52b14101fa Mon Sep 17 00:00:00 2001
From: heronhaye <surya@keyba.se>
Date: Thu, 19 Mar 2020 15:32:05 -0400
Subject: [PATCH] tuxbot fixes

---
 packaging/linux/fingerprint.sh              |  2 +-
 packaging/linux/tuxbot/init                 | 13 +++++--------
 packaging/linux/tuxbot/provision_tuxbot_env |  3 ---
 packaging/linux/tuxbot/tuxbot.service       |  1 +
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/packaging/linux/fingerprint.sh b/packaging/linux/fingerprint.sh
index d0b1d6ccdeeb..c22f4ed7e92c 100755
--- a/packaging/linux/fingerprint.sh
+++ b/packaging/linux/fingerprint.sh
@@ -4,7 +4,7 @@ set -e -u -o pipefail
 
 here="$(dirname "${BASH_SOURCE[0]}")"
 
-if [ -v KEYBASE_TEST_CODE_SIGNING_KEY ]; then
+if [ "${KEYBASE_TEST_CODE_SIGNING_KEY:-}" = "1" ]; then
     cat "$here/test_code_signing_fingerprint"
 else
     cat "$here/code_signing_fingerprint"
diff --git a/packaging/linux/tuxbot/init b/packaging/linux/tuxbot/init
index 20696d0d0c8c..a550736df27c 100755
--- a/packaging/linux/tuxbot/init
+++ b/packaging/linux/tuxbot/init
@@ -1,31 +1,28 @@
 #!/usr/bin/env bash
-set -euox pipefail
+set -euo pipefail
 
 systemctl --user daemon-reload
-systemctl --user import-environment
 
 for varname in SECRETS_TEAM SECRETS_REPO CHAT_TEAM CHAT_CHANNEL GNUPGHOME; do
     if [ -z "${!varname}" ]; then
         echo "No $varname found, check environment settings...aborting."
         exit 1
     fi
-    if ! systemctl --user show-environment | grep -q "$varname"; then
-        echo "systemd: No $varname found, check environment settings...aborting."
-        exit 1
-    fi
 done
 
 echo Enter tuxbot paperkey next
 keybase oneshot -u tuxbot
 
-echo Enter code signing key triplesec password next
-if [ -v KEYBASE_TEST_CODE_SIGNING_KEY ]; then
+if [ "${KEYBASE_TEST_CODE_SIGNING_KEY:-}" = "1" ]; then
+    echo Enter test code signing key triplesec password next
     opts="-b "
     fn=test_code_signing_key.gpg.3sv4
 else
+    echo Enter code signing key triplesec password next
     opts="-b --compatibility"
     fn=code_signing_key.gpg.3s
 fi
+echo "(wait until you seee 'Key (will not be printed):', may take a bit)"
 # shellcheck disable=SC2086
 triplesec dec $opts < "/keybase/team/$SECRETS_TEAM/.kbfs_autogit/$SECRETS_REPO/$fn" | gpg --import
 
diff --git a/packaging/linux/tuxbot/provision_tuxbot_env b/packaging/linux/tuxbot/provision_tuxbot_env
index 9de060d4ae51..54c744534b0f 100755
--- a/packaging/linux/tuxbot/provision_tuxbot_env
+++ b/packaging/linux/tuxbot/provision_tuxbot_env
@@ -3,6 +3,3 @@ set -euox pipefail
 
 # shellcheck disable=SC1090
 cat /home/vagrant/tuxbot.env > /etc/environment
-
-echo "[Manager]" > /etc/systemd/user.conf
-echo "DefaultEnvironment=$(xargs < /home/vagrant/tuxbot.env)" >> /etc/systemd/user.conf
diff --git a/packaging/linux/tuxbot/tuxbot.service b/packaging/linux/tuxbot/tuxbot.service
index e4ba246088d3..4256202e138f 100644
--- a/packaging/linux/tuxbot/tuxbot.service
+++ b/packaging/linux/tuxbot/tuxbot.service
@@ -3,6 +3,7 @@ Description=tuxbot
 
 [Service]
 WorkingDirectory=%h/go/src/github.com/keybase/client/packaging/linux/tuxbot/bot/
+EnvironmentFile=%h/tuxbot.env
 ExecStart=go run %h/go/src/github.com/keybase/client/packaging/linux/tuxbot/bot/tuxbot/
 Restart=on-failure