Composio powers 1000+ toolkits, tool search, context management, authentication, and a sandboxed workbench to help you build AI agents that turn intent into action.
Mirrored from https://github.com/Camo67/composio.git
Synced Nov 21, 17:15 UTC
fix(installer): address review regressions
jkomyno committed
Aug 2, 2026 at 02:31 UTC
cbb5f5a70f233fcf958e34851a5713eef680c79d
5 files changed
+126
-17
install.sh
+14
-2
@@ -278,7 +278,8 @@ print_post_install_help() {
278
[ "${COMPOSIO_INSTALL_HELP:-1}" != 0 ] || return 0
279
is_true "${COMPOSIO_QUIET:-}" && return 0
280
281
- shell_name=${SHELL##*/}
281
+ shell_name=${SHELL:-}
282
+ shell_name=${shell_name##*/}
283
shell_route=
284
shell_config=
285
case $shell_name in
@@ -325,6 +326,13 @@ cleanup() {
326
fi
327
}
328
329
+cleanup_on_signal() {
330
+ cleanup_signal=$1
331
+ trap - 0 1 2 3 15
332
+ cleanup || :
333
+ exit $((128 + cleanup_signal))
334
+}
335
+
336
main() {
337
install_agent=0
338
install_plugins=${COMPOSIO_INSTALL_PLUGINS:-0}
@@ -406,7 +414,11 @@ main() {
414
validate_url "$checksums_url" || error "Refusing unsafe checksum URL \"$checksums_url\""
415
416
tmpdir=$(mktemp -d) || error 'Failed to create a temporary directory'
409
- trap cleanup 0 1 2 3 15
417
+ trap cleanup 0
418
+ trap 'cleanup_on_signal 1' 1
419
+ trap 'cleanup_on_signal 2' 2
420
+ trap 'cleanup_on_signal 3' 3
421
+ trap 'cleanup_on_signal 15' 15
422
debug "temporary directory: $tmpdir"
423
424
info "Installing Composio CLI $version for $target"
install/bash.sh
+13
-2
@@ -50,7 +50,7 @@ download_installer() {
50
}
51
52
is_unsafe_path() {
53
- case $1 in *';'* | *'`'* | *'$'* | *'|'* | *'&'* | *'"'* | *"'"* | *'('* | *')'* | *\\*) return 0 ;; esac
53
+ case $1 in *':'* | *';'* | *'`'* | *'$'* | *'|'* | *'&'* | *'"'* | *"'"* | *'('* | *')'* | *\\*) return 0 ;; esac
54
variant_cr=$(printf '\r')
55
case $1 in *"$variant_cr"* | *'
56
'*) return 0 ;; esac
@@ -98,13 +98,24 @@ inline_shell_setup() {
98
99
cleanup() { [ -z "${variant_tmpdir:-}" ] || [ ! -d "$variant_tmpdir" ] || rm -rf "$variant_tmpdir"; }
100
101
+cleanup_on_signal() {
102
+ cleanup_signal=$1
103
+ trap - 0 1 2 3 15
104
+ cleanup || :
105
+ exit $((128 + cleanup_signal))
106
+}
107
+
108
main() {
109
variant_shell=$(requested_shell)
110
# Internal test override. User-facing docs intentionally omit this variable.
111
variant_script_url=${COMPOSIO_INSTALL_SCRIPT_URL:-https://raw.githubusercontent.com/ComposioHQ/composio/refs/heads/next/install.sh}
112
variant_tmpdir=$(mktemp -d) || error 'Failed to create a temporary directory'
113
debug "temporary directory: $variant_tmpdir"
107
- trap cleanup 0 1 2 3 15
114
+ trap cleanup 0
115
+ trap 'cleanup_on_signal 1' 1
116
+ trap 'cleanup_on_signal 2' 2
117
+ trap 'cleanup_on_signal 3' 3
118
+ trap 'cleanup_on_signal 15' 15
119
download_installer "$variant_script_url" "$variant_tmpdir/install.sh" || error 'Failed to download the base installer'
120
[ -s "$variant_tmpdir/install.sh" ] || error 'Downloaded base installer is empty'
121
install/fish.sh
+13
-2
@@ -50,7 +50,7 @@ download_installer() {
50
}
51
52
is_unsafe_path() {
53
- case $1 in *';'* | *'`'* | *'$'* | *'|'* | *'&'* | *'"'* | *"'"* | *'('* | *')'* | *\\*) return 0 ;; esac
53
+ case $1 in *':'* | *';'* | *'`'* | *'$'* | *'|'* | *'&'* | *'"'* | *"'"* | *'('* | *')'* | *\\*) return 0 ;; esac
54
variant_cr=$(printf '\r')
55
case $1 in *"$variant_cr"* | *'
56
'*) return 0 ;; esac
@@ -98,13 +98,24 @@ inline_shell_setup() {
98
99
cleanup() { [ -z "${variant_tmpdir:-}" ] || [ ! -d "$variant_tmpdir" ] || rm -rf "$variant_tmpdir"; }
100
101
+cleanup_on_signal() {
102
+ cleanup_signal=$1
103
+ trap - 0 1 2 3 15
104
+ cleanup || :
105
+ exit $((128 + cleanup_signal))
106
+}
107
+
108
main() {
109
variant_shell=$(requested_shell)
110
# Internal test override. User-facing docs intentionally omit this variable.
111
variant_script_url=${COMPOSIO_INSTALL_SCRIPT_URL:-https://raw.githubusercontent.com/ComposioHQ/composio/refs/heads/next/install.sh}
112
variant_tmpdir=$(mktemp -d) || error 'Failed to create a temporary directory'
113
debug "temporary directory: $variant_tmpdir"
107
- trap cleanup 0 1 2 3 15
114
+ trap cleanup 0
115
+ trap 'cleanup_on_signal 1' 1
116
+ trap 'cleanup_on_signal 2' 2
117
+ trap 'cleanup_on_signal 3' 3
118
+ trap 'cleanup_on_signal 15' 15
119
download_installer "$variant_script_url" "$variant_tmpdir/install.sh" || error 'Failed to download the base installer'
120
[ -s "$variant_tmpdir/install.sh" ] || error 'Downloaded base installer is empty'
121
install/zsh.sh
+13
-2
@@ -50,7 +50,7 @@ download_installer() {
50
}
51
52
is_unsafe_path() {
53
- case $1 in *';'* | *'`'* | *'$'* | *'|'* | *'&'* | *'"'* | *"'"* | *'('* | *')'* | *\\*) return 0 ;; esac
53
+ case $1 in *':'* | *';'* | *'`'* | *'$'* | *'|'* | *'&'* | *'"'* | *"'"* | *'('* | *')'* | *\\*) return 0 ;; esac
54
variant_cr=$(printf '\r')
55
case $1 in *"$variant_cr"* | *'
56
'*) return 0 ;; esac
@@ -98,13 +98,24 @@ inline_shell_setup() {
98
99
cleanup() { [ -z "${variant_tmpdir:-}" ] || [ ! -d "$variant_tmpdir" ] || rm -rf "$variant_tmpdir"; }
100
101
+cleanup_on_signal() {
102
+ cleanup_signal=$1
103
+ trap - 0 1 2 3 15
104
+ cleanup || :
105
+ exit $((128 + cleanup_signal))
106
+}
107
+
108
main() {
109
variant_shell=$(requested_shell)
110
# Internal test override. User-facing docs intentionally omit this variable.
111
variant_script_url=${COMPOSIO_INSTALL_SCRIPT_URL:-https://raw.githubusercontent.com/ComposioHQ/composio/refs/heads/next/install.sh}
112
variant_tmpdir=$(mktemp -d) || error 'Failed to create a temporary directory'
113
debug "temporary directory: $variant_tmpdir"
107
- trap cleanup 0 1 2 3 15
114
+ trap cleanup 0
115
+ trap 'cleanup_on_signal 1' 1
116
+ trap 'cleanup_on_signal 2' 2
117
+ trap 'cleanup_on_signal 3' 3
118
+ trap 'cleanup_on_signal 15' 15
119
download_installer "$variant_script_url" "$variant_tmpdir/install.sh" || error 'Failed to download the base installer'
120
[ -s "$variant_tmpdir/install.sh" ] || error 'Downloaded base installer is empty'
121
test/install-sh-release-resolution.test.sh
+73
-9
@@ -26,6 +26,16 @@ assert_not_contains() {
26
fi
27
}
28
29
+wait_for_file() {
30
+ local file=$1
31
+ local label=$2
32
+ for _ in {1..100}; do
33
+ [[ -f $file ]] && return 0
34
+ sleep 0.05
35
+ done
36
+ fail "$label"
37
+}
38
+
39
for script in "$repo_root/install.sh" "$repo_root"/install/*.sh; do
40
[[ $(tail -n 1 "$script") == 'main "$@"' ]] || fail "$script must end with main \"\$@\""
41
[[ $(grep -c '^main "\$@"$' "$script") -eq 1 ]] || fail "$script must contain one main entry point"
@@ -145,6 +155,11 @@ http://*)
155
;;
156
esac
157
158
+if [[ -n ${TEST_CURL_DELAY_URL:-} && $url == "$TEST_CURL_DELAY_URL" ]]; then
159
+ printf '%s\n' "$PPID" >"$TEST_CURL_PARENT_PID_FILE"
160
+ sleep "${TEST_CURL_DELAY_SECONDS:-1}"
161
+fi
162
+
163
if [[ $url == "$TEST_SCRIPT_URL" ]]; then
164
case ${TEST_BASE_MODE:-ok} in
165
fail) exit 22 ;;
@@ -267,7 +282,9 @@ EOF
282
reset_case() {
283
unset CASE_GITHUB_URL CASE_API_BASE CASE_INSTALL_VERSION CASE_PLUGINS CASE_QUIET CASE_DEBUG CASE_HELP
284
unset CASE_ALLOW_HTTP_HOST CASE_CHECKSUM_MODE CASE_API_ASSET_URL CASE_BASE_MODE CASE_REDIRECT_DOWNGRADE
270
- unset CASE_SHELL_CAPABILITY CASE_INSTALL_EXIT CASE_SETUP_EXIT CASE_VERSION_EXIT CASE_PATH_PREFIX
285
+ unset CASE_SHELL_CAPABILITY CASE_INSTALL_EXIT CASE_SETUP_EXIT CASE_VERSION_EXIT CASE_PATH_PREFIX CASE_UNSET_SHELL
286
+ unset CASE_CURL_DELAY_URL CASE_CURL_DELAY_SECONDS
287
+ rm -f "$case_root/curl-parent.pid"
288
: >"$curl_log"
289
: >"$composio_log"
290
}
@@ -278,6 +295,10 @@ EOF
295
local bin_dir=$3
296
shift 3
297
mkdir -p "$home" "$install_dir" "$bin_dir"
298
+ local -a installer_command=("$interpreter" "$repo_root/install.sh")
299
+ if [[ ${CASE_UNSET_SHELL:-0} == 1 ]]; then
300
+ installer_command=("$interpreter" -c 'unset SHELL; script=$1; shift; . "$script"' unset-shell "$repo_root/install.sh")
301
+ fi
302
env \
303
PATH="${CASE_PATH_PREFIX:-}$fake_bin:$PATH" \
304
HOME="$home" \
@@ -301,7 +322,10 @@ EOF
322
TEST_INSTALL_EXIT="${CASE_INSTALL_EXIT:-0}" \
323
TEST_SETUP_EXIT="${CASE_SETUP_EXIT:-0}" \
324
TEST_VERSION_EXIT="${CASE_VERSION_EXIT:-0}" \
304
- "$interpreter" "$repo_root/install.sh" "$@"
325
+ TEST_CURL_DELAY_URL="${CASE_CURL_DELAY_URL:-}" \
326
+ TEST_CURL_DELAY_SECONDS="${CASE_CURL_DELAY_SECONDS:-1}" \
327
+ TEST_CURL_PARENT_PID_FILE="$case_root/curl-parent.pid" \
328
+ "${installer_command[@]}" "$@"
329
}
330
331
run_variant() {
@@ -327,6 +351,9 @@ EOF
351
TEST_CHECKSUM_MODE=missing \
352
TEST_SHELL_CAPABILITY="${CASE_SHELL_CAPABILITY:-supported}" \
353
TEST_INSTALL_EXIT="${CASE_INSTALL_EXIT:-0}" \
354
+ TEST_CURL_DELAY_URL="${CASE_CURL_DELAY_URL:-}" \
355
+ TEST_CURL_DELAY_SECONDS="${CASE_CURL_DELAY_SECONDS:-1}" \
356
+ TEST_CURL_PARENT_PID_FILE="$case_root/curl-parent.pid" \
357
"$interpreter" "$repo_root/install/$shell_name.sh" "$@"
358
}
359
@@ -428,6 +455,41 @@ EOF
455
help_suppressed=$(run_installer "$case_root/help-home" "$case_root/help-install" "$case_root/help-bin" "$stable_tag" 2>&1)
456
assert_not_contains "$help_suppressed" 'next step' "$interpreter_name help suppression"
457
458
+ reset_case
459
+ CASE_UNSET_SHELL=1
460
+ run_installer "$case_root/unset-shell-home" "$case_root/unset-shell-install" "$case_root/unset-shell-bin" "$stable_tag" >/dev/null 2>&1 ||
461
+ fail "$interpreter_name unset SHELL must not fail after installation"
462
+
463
+ reset_case
464
+ CASE_CURL_DELAY_URL="$github_url/FakeOwner/fake-repo/releases/download/$stable_tag/$archive_name"
465
+ signal_output="$case_root/signal-installer.log"
466
+ run_installer "$case_root/signal-home" "$case_root/signal-install" "$case_root/signal-bin" "$stable_tag" >"$signal_output" 2>&1 &
467
+ signal_job=$!
468
+ wait_for_file "$case_root/curl-parent.pid" "$interpreter_name installer did not reach delayed download"
469
+ signal_pid=$(<"$case_root/curl-parent.pid")
470
+ kill -TERM "$signal_pid"
471
+ if wait "$signal_job"; then
472
+ fail "$interpreter_name installer must terminate after SIGTERM"
473
+ else
474
+ signal_status=$?
475
+ fi
476
+ [[ $signal_status -eq 143 ]] || fail "$interpreter_name installer SIGTERM status (got $signal_status)"
477
+
478
+ reset_case
479
+ CASE_CURL_DELAY_URL=$script_url
480
+ variant_signal_output="$case_root/signal-variant.log"
481
+ run_variant zsh "$case_root/signal-variant-home" "$case_root/signal-variant-install" "$case_root/signal-variant-bin" "$stable_tag" >"$variant_signal_output" 2>&1 &
482
+ variant_signal_job=$!
483
+ wait_for_file "$case_root/curl-parent.pid" "$interpreter_name shell variant did not reach delayed download"
484
+ variant_signal_pid=$(<"$case_root/curl-parent.pid")
485
+ kill -TERM "$variant_signal_pid"
486
+ if wait "$variant_signal_job"; then
487
+ fail "$interpreter_name shell variant must terminate after SIGTERM"
488
+ else
489
+ variant_signal_status=$?
490
+ fi
491
+ [[ $variant_signal_status -eq 143 ]] || fail "$interpreter_name shell variant SIGTERM status (got $variant_signal_status)"
492
+
493
reset_case
494
CASE_GITHUB_URL='http://127.0.0.1:8929'
495
CASE_API_BASE='http://127.0.0.1:8929/api'
@@ -498,13 +560,15 @@ EOF
560
grep -Fqx '# Composio CLI' "$bash_fallback_home/.bashrc" || fail "$interpreter_name bash fallback bashrc"
561
grep -Fqx '# Composio CLI' "$bash_fallback_home/.bash_profile" || fail "$interpreter_name bash fallback login override"
562
501
- reset_case
502
- CASE_SHELL_CAPABILITY=unsupported
503
- unsafe_home="$case_root/unsafe-variant-home"
504
- if run_variant zsh "$unsafe_home" "$case_root/unsafe-variant-install" "$case_root/unsafe;variant-bin" "$stable_tag" >/dev/null 2>&1; then
505
- fail "$interpreter_name unsafe variant bin dir must fail"
506
- fi
507
- [[ ! -e "$unsafe_home/.zshrc" ]] || fail "$interpreter_name unsafe variant must not write rc file"
563
+ for unsafe_character in ';' ':'; do
564
+ reset_case
565
+ CASE_SHELL_CAPABILITY=unsupported
566
+ unsafe_home="$case_root/unsafe-${unsafe_character//[^[:alnum:]]/delimiter}-variant-home"
567
+ if run_variant zsh "$unsafe_home" "$case_root/unsafe-variant-install" "$case_root/unsafe${unsafe_character}variant-bin" "$stable_tag" >/dev/null 2>&1; then
568
+ fail "$interpreter_name unsafe variant bin dir with $unsafe_character must fail"
569
+ fi
570
+ [[ ! -e "$unsafe_home/.zshrc" ]] || fail "$interpreter_name unsafe variant must not write rc file"
571
+ done
572
573
for base_mode in fail empty; do
574
reset_case