kevin/asdf
1
Fork 0
mirror of https://github.com/asdf-vm/asdf.git synced 2024-11-15 09:38:16 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'imefisto-master'

Browse Source
This commit is contained in:
Trevor Brown 2022-05-09 08:09:52 -04:00
commit 37046c7c64
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/commands/reshim.bash
View File

@ -145,12 +145,15 @@ remove_obsolete_shims() {
local formatted_shims local formatted_shims
local formatted_exec_names local formatted_exec_names
local temp_dir
temp_dir=${TMPDIR:-/tmp}
# comm only takes to files, so we write this data to temp files so we can # comm only takes to files, so we write this data to temp files so we can
# pass it to comm. # pass it to comm.
formatted_shims=$(mktemp /tmp/asdf-command-reshim-formatted-shims.XXXXXX) formatted_shims="$(mktemp "$temp_dir/asdf-command-reshim-formatted-shims.XXXXXX")"
printf "%s\\n" "$shims" >"$formatted_shims" printf "%s\\n" "$shims" >"$formatted_shims"
formatted_exec_names=$(mktemp /tmp/asdf-command-reshim-formatted-exec-names.XXXXXX) formatted_exec_names="$(mktemp "$temp_dir/asdf-command-reshim-formatted-exec-names.XXXXXX")"
printf "%s\\n" "$exec_names" >"$formatted_exec_names" printf "%s\\n" "$exec_names" >"$formatted_exec_names"
obsolete_shims=$(comm -23 "$formatted_shims" "$formatted_exec_names") obsolete_shims=$(comm -23 "$formatted_shims" "$formatted_exec_names")

7
lib/functions/versions.bash
View File

@ -74,9 +74,12 @@ list_all_command() {
plugin_path=$(get_plugin_path "$plugin_name") plugin_path=$(get_plugin_path "$plugin_name")
check_if_plugin_exists "$plugin_name" check_if_plugin_exists "$plugin_name"
local temp_dir
temp_dir=${TMPDIR:-/tmp}
# Capture return code to allow error handling # Capture return code to allow error handling
std_out_file="$(mktemp "/tmp/asdf-command-list-all-${plugin_name}.stdout.XXXXXX")" std_out_file="$(mktemp "$temp_dir/asdf-command-list-all-${plugin_name}.stdout.XXXXXX")"
std_err_file="$(mktemp "/tmp/asdf-command-list-all-${plugin_name}.stderr.XXXXXX")" std_err_file="$(mktemp "$temp_dir/asdf-command-list-all-${plugin_name}.stderr.XXXXXX")"
return_code=0 && "${plugin_path}/bin/list-all" >"$std_out_file" 2>"$std_err_file" || return_code=$? return_code=0 && "${plugin_path}/bin/list-all" >"$std_out_file" 2>"$std_err_file" || return_code=$?
if [[ $return_code -ne 0 ]]; then if [[ $return_code -ne 0 ]]; then