Skip to content

Commit 56f2180

Browse files
committed
feat(bundle): Parameterize binary names in install scripts
- Add CLI_BINARY_NAME, CHAT_BINARY_NAME, PTY_BINARY_NAME variables to bundle/linux/install.sh - Replace hardcoded binary names with variables in install commands - Add DESKTOP_BINARY_NAME variable to scripts/install.sh - Replace hardcoded 'q_desktop' with DESKTOP_BINARY_NAME variable 🤖 Assisted by Amazon Q Developer
1 parent 35c097a commit 56f2180

File tree

2 files changed

+14
-10
lines changed

2 files changed

+14
-10
lines changed

bundle/linux/install.sh

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ set -o errexit
77
set -o nounset
88

99
SCRIPT_DIR="$(dirname "$(readlink -f "$0")")"
10+
CLI_BINARY_NAME="q"
11+
CHAT_BINARY_NAME="qchat"
12+
PTY_BINARY_NAME="qterm"
1013

1114
log_error() {
1215
printf '\e[31m[ERROR]\e[0m %s\n' "$1" >&2
@@ -136,22 +139,22 @@ if is_target_triple_gnu && ! check_glibc_version; then
136139
fi
137140

138141
if [ -n "${Q_INSTALL_GLOBAL:-}" ]; then
139-
install -m 755 "$SCRIPT_DIR/bin/q" /usr/local/bin/
140-
install -m 755 "$SCRIPT_DIR/bin/qchat" /usr/local/bin/
141-
install -m 755 "$SCRIPT_DIR/bin/qterm" /usr/local/bin/
142+
install -m 755 "$SCRIPT_DIR/bin/$CLI_BINARY_NAME" /usr/local/bin/
143+
install -m 755 "$SCRIPT_DIR/bin/$CHAT_BINARY_NAME" /usr/local/bin/
144+
install -m 755 "$SCRIPT_DIR/bin/$PTY_BINARY_NAME" /usr/local/bin/
142145

143146
if [ -z "${Q_SKIP_SETUP:-}" ]; then
144-
/usr/local/bin/q integrations install dotfiles
145-
/usr/local/bin/q setup --global "$@"
147+
/usr/local/bin/$CLI_BINARY_NAME integrations install dotfiles
148+
/usr/local/bin/$CLI_BINARY_NAME setup --global "$@"
146149
fi
147150
else
148151
mkdir -p "$HOME/.local/bin"
149152

150-
install -m 755 "$SCRIPT_DIR/bin/q" "$HOME/.local/bin/"
151-
install -m 755 "$SCRIPT_DIR/bin/qchat" "$HOME/.local/bin/"
152-
install -m 755 "$SCRIPT_DIR/bin/qterm" "$HOME/.local/bin/"
153+
install -m 755 "$SCRIPT_DIR/bin/$CLI_BINARY_NAME" "$HOME/.local/bin/"
154+
install -m 755 "$SCRIPT_DIR/bin/$CHAT_BINARY_NAME" "$HOME/.local/bin/"
155+
install -m 755 "$SCRIPT_DIR/bin/$PTY_BINARY_NAME" "$HOME/.local/bin/"
153156

154157
if [ -z "${Q_SKIP_SETUP:-}" ]; then
155-
"$HOME/.local/bin/q" setup "$@"
158+
"$HOME/.local/bin/$CLI_BINARY_NAME" setup "$@"
156159
fi
157160
fi

scripts/install.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ set -eu
1010
BINARY_NAME="q"
1111
CLI_NAME="Q CLI"
1212
COMMAND_NAME="q"
13+
DESKTOP_BINARY_NAME="q_desktop"
1314
BASE_URL="https://desktop-release.q.us-east-1.amazonaws.com"
1415
MANIFEST_URL="${BASE_URL}/latest/manifest.json"
1516
MACOS_FILENAME="Amazon Q.dmg"
@@ -360,7 +361,7 @@ install_macos() {
360361
mkdir -p "$HOME/.local/bin"
361362
local macos_bin="$MACOS_APP_DIR/$app_name/Contents/MacOS"
362363

363-
"$macos_bin/q_desktop" --no-dashboard > /dev/null 2>&1 &
364+
"$macos_bin/$DESKTOP_BINARY_NAME" --no-dashboard > /dev/null 2>&1 &
364365
}
365366

366367
# Install on Linux

0 commit comments

Comments
 (0)