From a4e5bc1175c475d6fbe8f090326e0f5155927409 Mon Sep 17 00:00:00 2001 From: Aditya Gupta Date: Fri, 26 Jun 2026 21:37:11 +0530 Subject: [PATCH] refactor: Remove legacy backwards compat code Remove the configure shell code blocks --- installers/install_agy.sh | 5 ----- installers/install_bat.sh | 8 -------- installers/install_node.sh | 5 ----- installers/install_nvim.sh | 18 ------------------ installers/install_pnpm.sh | 5 ----- installers/install_rust.sh | 5 ----- installers/install_starship.sh | 6 ------ installers/install_uv.sh | 6 ------ installers/install_yazi.sh | 5 ----- installers/install_zoxide.sh | 5 ----- 10 files changed, 68 deletions(-) diff --git a/installers/install_agy.sh b/installers/install_agy.sh index 4a8150d..7685fb3 100644 --- a/installers/install_agy.sh +++ b/installers/install_agy.sh @@ -132,11 +132,6 @@ install_agy() { } configure_shell() { - # Clean up legacy in-place configuration blocks - IFS=' ' read -ra target_files <<< "$(get_shell_configs)" - for config_file in "${target_files[@]}"; do - remove_block "$config_file" "local-bin path" - done write_env_snippet "local-bin" 'export PATH="$HOME/.local/bin:$PATH"' } diff --git a/installers/install_bat.sh b/installers/install_bat.sh index 557482f..2228aba 100644 --- a/installers/install_bat.sh +++ b/installers/install_bat.sh @@ -70,14 +70,6 @@ install_bat() { } configure_shell() { - # Clean up legacy in-place configuration blocks - IFS=' ' read -ra target_files <<< "$(get_shell_configs)" - for config_file in "${target_files[@]}"; do - remove_block "$config_file" "bat alias" - done - if [ -f "$HOME/.bash_aliases" ]; then - remove_block "$HOME/.bash_aliases" "bat alias" - fi write_alias_snippet "bat" "alias cat='bat --paging=never -p'" } diff --git a/installers/install_node.sh b/installers/install_node.sh index 6ce4377..fc27986 100644 --- a/installers/install_node.sh +++ b/installers/install_node.sh @@ -58,11 +58,6 @@ install_nvm() { } configure_shell() { - # Clean up legacy in-place configuration blocks - IFS=' ' read -ra target_files <<< "$(get_shell_configs)" - for config_file in "${target_files[@]}"; do - remove_block "$config_file" "nvm setup" - done local content content=$(cat << 'EOF' diff --git a/installers/install_nvim.sh b/installers/install_nvim.sh index 943e393..e0c4ab2 100644 --- a/installers/install_nvim.sh +++ b/installers/install_nvim.sh @@ -111,24 +111,6 @@ install_config() { } configure_shell() { - # Clean up legacy inline edits from bashrc and bash_aliases - IFS=' ' read -ra target_files <<< "$(get_shell_configs)" - for config_file in "${target_files[@]}"; do - if [ -f "$config_file" ]; then - local tmp_file - tmp_file=$(mktemp) - sed '/^export EDITOR="nvim"/d' "$config_file" > "$tmp_file" - cat "$tmp_file" > "$config_file" - rm -f "$tmp_file" - fi - done - if [ -f "$HOME/.bash_aliases" ]; then - local tmp_file - tmp_file=$(mktemp) - sed '/^alias vim="nvim"/d' "$HOME/.bash_aliases" > "$tmp_file" - cat "$tmp_file" > "$HOME/.bash_aliases" - rm -f "$tmp_file" - fi write_alias_snippet "nvim" 'alias vim="nvim"' write_env_snippet "nvim" 'export EDITOR="nvim"' diff --git a/installers/install_pnpm.sh b/installers/install_pnpm.sh index 0db0559..729719c 100644 --- a/installers/install_pnpm.sh +++ b/installers/install_pnpm.sh @@ -189,11 +189,6 @@ install_pnpm() { # ─── Shell Configuration ───────────────────────────────────────────── configure_shell() { - # Clean up legacy in-place configuration blocks - IFS=' ' read -ra target_files <<< "$(get_shell_configs)" - for config_file in "${target_files[@]}"; do - remove_block "$config_file" "pnpm setup" - done # pnpm's `setup --force` configures PNPM_HOME and PATH automatically, # but we also add an env block to ensure PNPM_HOME is set consistently. diff --git a/installers/install_rust.sh b/installers/install_rust.sh index 09c81c6..065ac5c 100644 --- a/installers/install_rust.sh +++ b/installers/install_rust.sh @@ -95,11 +95,6 @@ configure_shell() { # Add ~/.cargo/bin to PATH for the current process export PATH="$HOME/.cargo/bin:$PATH" - # Clean up legacy in-place configuration blocks - IFS=' ' read -ra target_files <<< "$(get_shell_configs)" - for config_file in "${target_files[@]}"; do - remove_block "$config_file" "rust init" - done write_env_snippet "rust" '. "$HOME/.cargo/env"' } diff --git a/installers/install_starship.sh b/installers/install_starship.sh index 4ef2d70..3f2f6a0 100644 --- a/installers/install_starship.sh +++ b/installers/install_starship.sh @@ -74,12 +74,6 @@ configure_shell() { # Add ~/.local/bin to PATH for the current process export PATH="$HOME/.local/bin:$PATH" - # Clean up legacy in-place configuration blocks - IFS=' ' read -ra target_files <<< "$(get_shell_configs)" - for config_file in "${target_files[@]}"; do - remove_block "$config_file" "local-bin path" - remove_block "$config_file" "starship init" - done write_env_snippet "local-bin" 'export PATH="$HOME/.local/bin:$PATH"' write_env_snippet "starship" 'eval "$(starship init bash)"' diff --git a/installers/install_uv.sh b/installers/install_uv.sh index 0c89324..baf0a77 100644 --- a/installers/install_uv.sh +++ b/installers/install_uv.sh @@ -85,12 +85,6 @@ configure_shell() { # Add ~/.local/bin to PATH for the current process export PATH="$HOME/.local/bin:$PATH" - # Clean up legacy in-place configuration blocks - IFS=' ' read -ra target_files <<< "$(get_shell_configs)" - for config_file in "${target_files[@]}"; do - remove_block "$config_file" "local-bin path" - remove_block "$config_file" "uv completion" - done write_env_snippet "local-bin" 'export PATH="$HOME/.local/bin:$PATH"' write_env_snippet "uv" 'eval "$(uv generate-shell-completion bash)"' diff --git a/installers/install_yazi.sh b/installers/install_yazi.sh index cd193e3..5c70f71 100755 --- a/installers/install_yazi.sh +++ b/installers/install_yazi.sh @@ -22,11 +22,6 @@ cleanup() { trap cleanup EXIT add_y_wrapper() { - # Clean up legacy in-place configuration blocks - IFS=' ' read -ra target_files <<< "$(get_shell_configs)" - for config_file in "${target_files[@]}"; do - remove_block "$config_file" "yazi wrapper" - done local wrapper_content wrapper_content=$(cat << 'EOF' diff --git a/installers/install_zoxide.sh b/installers/install_zoxide.sh index 957cc66..c03f137 100755 --- a/installers/install_zoxide.sh +++ b/installers/install_zoxide.sh @@ -49,11 +49,6 @@ configure_shell() { # Add ~/.local/bin to PATH for the current process export PATH="$HOME/.local/bin:$PATH" - # Clean up legacy in-place configuration blocks - IFS=' ' read -ra target_files <<< "$(get_shell_configs)" - for config_file in "${target_files[@]}"; do - remove_block "$config_file" "zoxide init" - done write_env_snippet "local-bin" 'export PATH="$HOME/.local/bin:$PATH"' write_env_snippet "zoxide" 'eval "$(zoxide init --cmd cd bash)"'