mirror of
https://github.com/ivuorinen/dotfiles.git
synced 2026-03-18 21:06:06 +00:00
fix: improve shell detection, curl flags, and cleanup robustness
- Use ZSH_VERSION instead of ZSH_NAME for reliable zsh detection - Document NVIM_* env vars as optional external overrides - Add -fsSL flags to curl for mise bootstrap - Consolidate duplicate shellcheck directives in install-fonts.sh - Add explicit return 0 to cleanup script helper functions - Add actionable remediation to uv-not-found error message
This commit is contained in:
@@ -36,6 +36,7 @@ remove_dir()
|
|||||||
rm -rf "$dir"
|
rm -rf "$dir"
|
||||||
msgr run_done "Removed $label"
|
msgr run_done "Removed $label"
|
||||||
fi
|
fi
|
||||||
|
return 0
|
||||||
}
|
}
|
||||||
|
|
||||||
remove_file()
|
remove_file()
|
||||||
@@ -48,6 +49,7 @@ remove_file()
|
|||||||
rm -f "$file"
|
rm -f "$file"
|
||||||
msgr run_done "Removed $label: $file"
|
msgr run_done "Removed $label: $file"
|
||||||
fi
|
fi
|
||||||
|
return 0
|
||||||
}
|
}
|
||||||
|
|
||||||
msgr msg "Cleaning up old version manager installations..."
|
msgr msg "Cleaning up old version manager installations..."
|
||||||
|
|||||||
@@ -51,7 +51,6 @@ install_fonts()
|
|||||||
{
|
{
|
||||||
msgr run "Starting to install NerdFonts..."
|
msgr run "Starting to install NerdFonts..."
|
||||||
# shellcheck disable=SC2048,SC2086
|
# shellcheck disable=SC2048,SC2086
|
||||||
# shellcheck disable=SC2086
|
|
||||||
./install.sh -q -s ${fonts[*]} \
|
./install.sh -q -s ${fonts[*]} \
|
||||||
&& msgr run_done "Done"
|
&& msgr run_done "Done"
|
||||||
return 0
|
return 0
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ msgr run "Starting to install Python libraries"
|
|||||||
|
|
||||||
# Ensure uv is available
|
# Ensure uv is available
|
||||||
if ! command -v uv &> /dev/null; then
|
if ! command -v uv &> /dev/null; then
|
||||||
msgr err "uv not found — install it via mise first"
|
msgr err "uv not found — install it via mise first (run: dfm install mise)"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user