gravitational/teleport
1
0
Fork 0
mirror of https://github.com/gravitational/teleport.git synced 2026-10-11 22:49:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing some issues with the Mac build for ent (#48457)

Browse Source 
* Adding symbolic links in bindir to app bundle binary

* Updating pkg script to support ent better

* Fixing name of teleport-ent bin package

* Fixing some typos in mac install script
This commit is contained in:
Gus Rivera
2024-11-05 21:47:40 +00:00
committed by GitHub
parent 91003b4981
commit 4633c48c1d
3 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.assets/build-package.sh
+1 -1
View File
@@ -221,7 +221,7 @@ if [[ "${PACKAGE_TYPE}" == "pkg" ]]; then
FILE_LIST="${TAR_PATH}/teleport ${TAR_PATH}/tbot ${TAR_PATH}/fdpass-teleport"
BUNDLE_ID="${b:-com.gravitational.teleport}"
if [[ "${TELEPORT_TYPE}" == "ent" ]]; then
PKG_FILENAME="teleport-ent-${TELEPORT_VERSION}${ARCH_TAG}.${PACKAGE_TYPE}"
PKG_FILENAME="teleport-ent-bin-${TELEPORT_VERSION}${ARCH_TAG}.${PACKAGE_TYPE}"
else
PKG_FILENAME="teleport-bin-${TELEPORT_VERSION}${ARCH_TAG}.${PACKAGE_TYPE}"
fi
build.assets/build-pkg-app.sh
+1 -1
View File
@@ -162,7 +162,7 @@ or name of the key to sign packages"
# Prepare app shell.
local target="$tmp/root/$PACKAGE_NAME.app"
cp -r "$tmp/teleport/$PACKAGE_NAME.app" "$target"
cp -r "$tmp/teleport$ent/$PACKAGE_NAME.app" "$target"
local entitlements="$buildassets/macos/$TSH_SKELETON/$TSH_SKELETON.entitlements"
if [[ "$PACKAGE_NAME" == "tctl" ]]; then
build.assets/macos/install
+22
View File
@@ -38,6 +38,28 @@ cp -f teleport tbot fdpass-teleport $BINDIR/ || exit 1
cp -rf tsh.app/ "$APPS_DIR"/tsh.app/ || exit 1
cp -rf tctl.app/ "$APPS_DIR"/tctl.app/ || exit 1
# If tsh exists and is not a link, make a backup.
if [ -f "$BINDIR/tsh" ] && [ ! -L "$BINDIR/tsh" ]; then
rm -f "$BINDIR/tsh.bak"
mv "$BINDIR/tsh" "$BINDIR/tsh.bak"
fi
# Link package to $BINDIR.
rm -f "$BINDIR/tsh" # in case link exists
ln -s "$APPS_DIR/tsh.app/Contents/MacOS/tsh" "$BINDIR/tsh"
# If tctl exists and is not a link, make a backup.
if [ -f "$BINDIR/tctl" ] && [ ! -L "$BINDIR/tctl" ]; then
rm -f "$BINDIR/tctl.bak"
mv "$BINDIR/tctl" "$BINDIR/tctl.bak"
fi
# Link package to $BINDIR.
rm -f "$BINDIR/tctl" # in case link exists
ln -s "$APPS_DIR/tctl.app/Contents/MacOS/tctl" "$BINDIR/tctl"
echo "Teleport binaries have been copied to $BINDIR"
echo ""
echo "Thanks for installing Teleport."