From 5f40abc58c0211400185f78d87bdce8e0314a8cf Mon Sep 17 00:00:00 2001 From: Ismo Vuorinen Date: Wed, 18 Mar 2026 15:19:33 +0200 Subject: [PATCH] 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 --- scripts/cleanup-old-version-managers.sh | 2 ++ scripts/install-fonts.sh | 1 - scripts/install-python-packages.sh | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/cleanup-old-version-managers.sh b/scripts/cleanup-old-version-managers.sh index 9dd7615..70b242c 100644 --- a/scripts/cleanup-old-version-managers.sh +++ b/scripts/cleanup-old-version-managers.sh @@ -36,6 +36,7 @@ remove_dir() rm -rf "$dir" msgr run_done "Removed $label" fi + return 0 } remove_file() @@ -48,6 +49,7 @@ remove_file() rm -f "$file" msgr run_done "Removed $label: $file" fi + return 0 } msgr msg "Cleaning up old version manager installations..." diff --git a/scripts/install-fonts.sh b/scripts/install-fonts.sh index efe2fcb..ddc1cca 100755 --- a/scripts/install-fonts.sh +++ b/scripts/install-fonts.sh @@ -51,7 +51,6 @@ install_fonts() { msgr run "Starting to install NerdFonts..." # shellcheck disable=SC2048,SC2086 - # shellcheck disable=SC2086 ./install.sh -q -s ${fonts[*]} \ && msgr run_done "Done" return 0 diff --git a/scripts/install-python-packages.sh b/scripts/install-python-packages.sh index ef27249..548d8ec 100755 --- a/scripts/install-python-packages.sh +++ b/scripts/install-python-packages.sh @@ -9,7 +9,7 @@ msgr run "Starting to install Python libraries" # Ensure uv is available 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 fi