attempt to fix asdf when some files have windows line endings (#1653)

pull/1676/head
Roman Perepelitsa 3 years ago
parent 3380f7503e
commit abc5df446d

@ -5348,7 +5348,7 @@ function _p9k_asdf_init_meta() {
files+=$parse files+=$parse
[[ -x $parse ]] && has_parse=1 [[ -x $parse ]] && has_parse=1
local name local name
for name in $($list_names 2>/dev/null); do for name in ${$($list_names 2>/dev/null)%$'\r'}; do
[[ $name == (*/*|.tool-versions) ]] && continue [[ $name == (*/*|.tool-versions) ]] && continue
_p9k_asdf_file_info[$name]+="${plugin:t} $has_parse " _p9k_asdf_file_info[$name]+="${plugin:t} $has_parse "
done done
@ -5402,8 +5402,8 @@ function _p9k_asdf_parse_version_file() {
local v=($(${ASDF_DATA_DIR:-~/.asdf}/plugins/$plugin/bin/parse-legacy-file $file 2>/dev/null)) local v=($(${ASDF_DATA_DIR:-~/.asdf}/plugins/$plugin/bin/parse-legacy-file $file 2>/dev/null))
else else
{ local v=($(<$file)) } 2>/dev/null { local v=($(<$file)) } 2>/dev/null
v=(${v%$'\r'})
fi fi
v=(${v%$'\r'})
v=${v[(r)$_p9k_asdf_plugins[$plugin]]:-$v[1]} v=${v[(r)$_p9k_asdf_plugins[$plugin]]:-$v[1]}
_p9k_asdf_file2versions[$plugin:$file]=$stat[1]:"$v" _p9k_asdf_file2versions[$plugin:$file]=$stat[1]:"$v"
_p9k__state_dump_scheduled=1 _p9k__state_dump_scheduled=1

Loading…
Cancel
Save