Composio powers 1000+ toolkits, tool search, context management, authentication, and a sandboxed workbench to help you build AI agents that turn intent into action.
TypeScript agentic-aiagentsaiai-agentsaiagentsdeveloper-toolsfunction-callinggpt-4javascriptjsllmllmopsmcppythonremote-mcp-serverssetypescript
fix(installer): escape the install dir before writing it into shell rc files
jkomyno9f10adcc8d33
diff --git a/install.sh b/install.shindex d6d4cd7b3..2a2e37279 100755--- a/install.sh+++ b/install.sh@@ -69,6 +69,24 @@ tildify() {fi}+# Escape a value for embedding inside a double-quoted shell rc line, so an+# install directory containing `$(...)`, a backtick, or a quote is written as+# literal text instead of becoming live code the next time the rc is sourced.+# Backslashes must be escaped first. The second argument selects whether+# backticks are escaped: bash and zsh perform backtick substitution inside+# double quotes, fish does not — and fish does not recognize \` there either,+# so escaping it for fish would corrupt the path.+escape_for_double_quotes() {+ local value=$1 escape_backticks=${2:-true}+ value=${value//\\/\\\\}+ if [[ $escape_backticks = true ]]; then+ value=${value//\`/\\\`}+ fi+ value=${value//\$/\\\$}+ value=${value//\"/\\\"}+ printf '%s' "$value"+}+install_agent=falseinstall_plugins=trueversion_arg=""@@ -322,10 +340,16 @@ elseinfo "Setting up shell integration..."refresh_command=''- quoted_install_dir=\"${COMPOSIO_INSTALL_DIR//\"/\\\"}\"- if [[ $quoted_install_dir = \"$HOME/* ]]; then- quoted_install_dir=${COMPOSIO_INSTALL_DIR/$HOME\//\$HOME/}+ # Every rc line below embeds one of these inside double quotes. `$HOME` is+ # re-applied after escaping so the intended variable reference survives as+ # a literal `$HOME` while any user-supplied `$` stays escaped.+ escaped_install_dir=$(escape_for_double_quotes "$COMPOSIO_INSTALL_DIR")+ escaped_install_dir_fish=$(escape_for_double_quotes "$COMPOSIO_INSTALL_DIR" false)+ home_relative_install_dir=$escaped_install_dir++ if [[ $COMPOSIO_INSTALL_DIR = "$HOME"/* ]]; then+ home_relative_install_dir='$HOME/'$(escape_for_double_quotes "${COMPOSIO_INSTALL_DIR#"$HOME"/}")fishell_name=$(basename "${SHELL:-}")@@ -334,7 +358,7 @@ elsecase $shell_name infish)commands=(- "set --export COMPOSIO_INSTALL_DIR \"$COMPOSIO_INSTALL_DIR\""+ "set --export COMPOSIO_INSTALL_DIR \"$escaped_install_dir_fish\"""set --export PATH \$COMPOSIO_INSTALL_DIR \$PATH")fish_config=$HOME/.config/fish/config.fish@@ -354,7 +378,7 @@ else;;zsh)commands=(- "export COMPOSIO_INSTALL_DIR=\"$COMPOSIO_INSTALL_DIR\""+ "export COMPOSIO_INSTALL_DIR=\"$escaped_install_dir\"""export PATH=\"\$COMPOSIO_INSTALL_DIR:\$PATH\"")zsh_config=$HOME/.zshrc@@ -374,7 +398,7 @@ else;;bash)commands=(- "export COMPOSIO_INSTALL_DIR=$quoted_install_dir"+ "export COMPOSIO_INSTALL_DIR=\"$home_relative_install_dir\"""export PATH=\"\$COMPOSIO_INSTALL_DIR:\$PATH\"")bash_configs=("$HOME/.bashrc" "$HOME/.bash_profile")@@ -402,7 +426,7 @@ else;;*)echo 'Manually add the directory to ~/.bashrc (or similar):'- info_bold " export COMPOSIO_INSTALL_DIR=$quoted_install_dir"+ info_bold " export COMPOSIO_INSTALL_DIR=\"$home_relative_install_dir\""info_bold " export PATH=\"\$COMPOSIO_INSTALL_DIR:\$PATH\"";;esacdiff --git a/test/install-sh-release-resolution.test.sh b/test/install-sh-release-resolution.test.shindex ffec6f81e..fb06f7963 100755--- a/test/install-sh-release-resolution.test.sh+++ b/test/install-sh-release-resolution.test.sh@@ -383,6 +383,28 @@ if ! grep -qxF '# Composio CLI' "$failed_probe_home/.bashrc"; thenexit 1fi+# The inline fallback embeds the install directory in rc lines. A directory+# holding `$(...)` must land there as literal text, not as a command that runs+# at every shell start.+injection_home="$tmpdir/home-injection"+injection_marker="$tmpdir/injection-marker"+injection_install="$tmpdir/inject-\$(touch $injection_marker)"+mkdir -p "$injection_home" "$injection_install"+: > "$injection_home/.bashrc"+: > "$composio_log"+TEST_VERSION_EXIT=126 run_installer "$injection_home" "$injection_install" --no-plugins >/dev/null 2>&1+bash -c 'source "$1"' _ "$injection_home/.bashrc" >/dev/null 2>&1 || true+if [[ -e "$injection_marker" ]]; then+ echo 'Expected inline shell integration to escape command substitution in COMPOSIO_INSTALL_DIR.' >&2+ cat "$injection_home/.bashrc" >&2+ exit 1+fi+if ! grep -qF '\$(touch' "$injection_home/.bashrc"; then+ echo 'Expected the escaped install directory to be written to .bashrc.' >&2+ cat "$injection_home/.bashrc" >&2+ exit 1+fi+no_plugins_home="$tmpdir/home-no-plugins"no_plugins_install="$tmpdir/install-no-plugins"mkdir -p "$no_plugins_home" "$no_plugins_install"