kevin/asdf
1
Fork 0
mirror of https://github.com/asdf-vm/asdf.git synced 2024-12-19 09:55:01 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix: handle case correctly when shim_args is empty

Browse Source
This commit is contained in:
Dossy Shiobara 2024-12-16 20:23:28 -05:00 committed by GitHub
parent bd19e4cbdc
commit 0bbeeffc7c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/commands/command-exec.bash
View File

@ -3,7 +3,11 @@
shim_exec_command() { shim_exec_command() {
local shim_name local shim_name
shim_name=$(basename "$1") shim_name=$(basename "$1")
local shim_args=("${@:2}")
local shim_args=()
if [ $# -gt 1 ]; then
shim_args=("${@:2}")
fi
if [ -z "$shim_name" ]; then if [ -z "$shim_name" ]; then
printf "usage: asdf exec <command>\n" printf "usage: asdf exec <command>\n"
@ -20,12 +24,25 @@ shim_exec_command() {
exit 2 exit 2
fi fi
asdf_run_hook "pre_${plugin_name}_${shim_name}" "${shim_args[@]}" # Check if array is empty before using it
pre_status=$? if [ ${#shim_args[@]} -eq 0 ]; then
asdf_run_hook "pre_${plugin_name}_${shim_name}"
pre_status=$?
else
asdf_run_hook "pre_${plugin_name}_${shim_name}" "${shim_args[@]}"
pre_status=$?
fi
if [ "$pre_status" -ne 0 ]; then if [ "$pre_status" -ne 0 ]; then
return "$pre_status" return "$pre_status"
fi fi
exec "$executable_path" "${shim_args[@]}"
# Check if array is empty before using it
if [ ${#shim_args[@]} -eq 0 ]; then
exec "$executable_path"
else
exec "$executable_path" "${shim_args[@]}"
fi
} }
with_shim_executable "$shim_name" exec_shim || exit $? with_shim_executable "$shim_name" exec_shim || exit $?