From 57161490b1078ed3ae5dcdde6d511e1538f07208 Mon Sep 17 00:00:00 2001
From: Tim Buckley <tim@goteleport.com>
Date: Fri, 25 Feb 2022 14:04:16 -0700
Subject: [PATCH 1/2] Include tbot binary in Teleport packages and installs

This includes the tbot binary in .rpm, .deb, and .pkg distributions,
and ensures the binary is installed using the `install` script in
.tar.gz packages.
---
 build.assets/build-package.sh | 8 ++++----
 build.assets/install          | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/build.assets/build-package.sh b/build.assets/build-package.sh
index 17e1bfbc52eb6..b4746a7d115f9 100755
--- a/build.assets/build-package.sh
+++ b/build.assets/build-package.sh
@@ -228,11 +228,11 @@ if [[ "${PACKAGE_TYPE}" == "pkg" ]]; then
     NOTARIZE_PKG="true"
     # handle mac client-only builds
     if [[ "${BUILD_MODE}" == "tsh" ]]; then
-        FILE_LIST="${TAR_PATH}/tsh"
+        FILE_LIST="${TAR_PATH}/tsh ${TAR_PATH}/tbot"
         BUNDLE_ID="com.gravitational.teleport.tsh"
         PKG_FILENAME="tsh-${TELEPORT_VERSION}.${PACKAGE_TYPE}"
     else
-        FILE_LIST="${TAR_PATH}/tsh ${TAR_PATH}/tctl ${TAR_PATH}/teleport"
+        FILE_LIST="${TAR_PATH}/tsh ${TAR_PATH}/tctl ${TAR_PATH}/teleport ${TAR_PATH}/tbot"
         BUNDLE_ID="com.gravitational.teleport"
         if [[ "${TELEPORT_TYPE}" == "ent" ]]; then
             PKG_FILENAME="teleport-ent-${TELEPORT_VERSION}.${PACKAGE_TYPE}"
@@ -241,8 +241,8 @@ if [[ "${PACKAGE_TYPE}" == "pkg" ]]; then
         fi
     fi
 else
-    FILE_LIST="${TAR_PATH}/tsh ${TAR_PATH}/tctl ${TAR_PATH}/teleport ${TAR_PATH}/examples/systemd/teleport.service"
-    LINUX_BINARY_FILE_LIST="${TAR_PATH}/tsh ${TAR_PATH}/tctl ${TAR_PATH}/teleport"
+    FILE_LIST="${TAR_PATH}/tsh ${TAR_PATH}/tctl ${TAR_PATH}/teleport ${TAR_PATH}/tbot ${TAR_PATH}/examples/systemd/teleport.service"
+    LINUX_BINARY_FILE_LIST="${TAR_PATH}/tsh ${TAR_PATH}/tctl ${TAR_PATH}/tbot ${TAR_PATH}/teleport"
     LINUX_SYSTEMD_FILE_LIST="${TAR_PATH}/examples/systemd/teleport.service"
     EXTRA_DOCKER_OPTIONS=""
     RPM_SIGN_STANZA=""
diff --git a/build.assets/install b/build.assets/install
index cc3bed422ccdb..dc6ff9d0cd39f 100755
--- a/build.assets/install
+++ b/build.assets/install
@@ -13,7 +13,7 @@ VARDIR=/var/lib/teleport
 [ ! $(id -u) != "0" ] || { echo "ERROR: You must be root"; exit 1; }
 cd $(dirname $0)
 mkdir -p $VARDIR $BINDIR
-cp -f teleport tctl tsh $BINDIR/ || exit 1
+cp -f teleport tctl tsh tbot $BINDIR/ || exit 1
 
 #
 # What operating system is the user running?

From baa919bd79708ebc6bf619a836598457e3302da2 Mon Sep 17 00:00:00 2001
From: Tim Buckley <tim@goteleport.com>
Date: Fri, 25 Feb 2022 16:31:27 -0700
Subject: [PATCH 2/2] Remove tbot from macOS client-only builds

---
 build.assets/build-package.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.assets/build-package.sh b/build.assets/build-package.sh
index b4746a7d115f9..22d90fd713d09 100755
--- a/build.assets/build-package.sh
+++ b/build.assets/build-package.sh
@@ -228,7 +228,7 @@ if [[ "${PACKAGE_TYPE}" == "pkg" ]]; then
     NOTARIZE_PKG="true"
     # handle mac client-only builds
     if [[ "${BUILD_MODE}" == "tsh" ]]; then
-        FILE_LIST="${TAR_PATH}/tsh ${TAR_PATH}/tbot"
+        FILE_LIST="${TAR_PATH}/tsh"
         BUNDLE_ID="com.gravitational.teleport.tsh"
         PKG_FILENAME="tsh-${TELEPORT_VERSION}.${PACKAGE_TYPE}"
     else