Skip to content

Commit

Permalink
Include tbot binary in Teleport packages and installs (#10646)
Browse files Browse the repository at this point in the history
* 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.

* Remove tbot from macOS client-only builds
  • Loading branch information
timothyb89 authored Mar 3, 2022
1 parent a8aae24 commit 6d83fed
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions build.assets/build-package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ if [[ "${PACKAGE_TYPE}" == "pkg" ]]; then
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}"
Expand All @@ -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=""
Expand Down
2 changes: 1 addition & 1 deletion build.assets/install
Original file line number Diff line number Diff line change
Expand Up @@ -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?
Expand Down

0 comments on commit 6d83fed

Please sign in to comment.