Add success messages to legacy cleanup steps
Added explicit success messages after removing legacy installations for nvm, rbenv, rustup, and Go workspace in the cleanup_legacy_install function. Also updated ensure_apt_working to use the $STD variable for apt update commands for consistency.
This commit is contained in:
parent
f19d36f529
commit
dec609fb6a
@ -118,6 +118,7 @@ cleanup_legacy_install() {
|
|||||||
msg_info "Removing legacy nvm installation"
|
msg_info "Removing legacy nvm installation"
|
||||||
rm -rf "$HOME/.nvm" "$HOME/.npm" "$HOME/.bower" "$HOME/.config/yarn" 2>/dev/null || true
|
rm -rf "$HOME/.nvm" "$HOME/.npm" "$HOME/.bower" "$HOME/.config/yarn" 2>/dev/null || true
|
||||||
sed -i '/NVM_DIR/d' "$HOME/.bashrc" "$HOME/.profile" 2>/dev/null || true
|
sed -i '/NVM_DIR/d' "$HOME/.bashrc" "$HOME/.profile" 2>/dev/null || true
|
||||||
|
msg_ok "Legacy nvm installation removed"
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
ruby)
|
ruby)
|
||||||
@ -125,6 +126,7 @@ cleanup_legacy_install() {
|
|||||||
msg_info "Removing legacy rbenv installation"
|
msg_info "Removing legacy rbenv installation"
|
||||||
rm -rf "$HOME/.rbenv" 2>/dev/null || true
|
rm -rf "$HOME/.rbenv" 2>/dev/null || true
|
||||||
sed -i '/rbenv/d' "$HOME/.bashrc" "$HOME/.profile" 2>/dev/null || true
|
sed -i '/rbenv/d' "$HOME/.bashrc" "$HOME/.profile" 2>/dev/null || true
|
||||||
|
msg_ok "Legacy rbenv installation removed"
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
rust)
|
rust)
|
||||||
@ -132,6 +134,7 @@ cleanup_legacy_install() {
|
|||||||
msg_info "Removing legacy rustup installation"
|
msg_info "Removing legacy rustup installation"
|
||||||
rm -rf "$HOME/.cargo" "$HOME/.rustup" 2>/dev/null || true
|
rm -rf "$HOME/.cargo" "$HOME/.rustup" 2>/dev/null || true
|
||||||
sed -i '/cargo/d' "$HOME/.bashrc" "$HOME/.profile" 2>/dev/null || true
|
sed -i '/cargo/d' "$HOME/.bashrc" "$HOME/.profile" 2>/dev/null || true
|
||||||
|
msg_ok "Legacy rustup installation removed"
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
go | golang)
|
go | golang)
|
||||||
@ -139,6 +142,7 @@ cleanup_legacy_install() {
|
|||||||
msg_info "Removing legacy Go workspace"
|
msg_info "Removing legacy Go workspace"
|
||||||
# Keep user code, just remove GOPATH env
|
# Keep user code, just remove GOPATH env
|
||||||
sed -i '/GOPATH/d' "$HOME/.bashrc" "$HOME/.profile" 2>/dev/null || true
|
sed -i '/GOPATH/d' "$HOME/.bashrc" "$HOME/.profile" 2>/dev/null || true
|
||||||
|
msg_ok "Legacy Go workspace cleaned"
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
@ -1129,13 +1133,13 @@ ensure_apt_working() {
|
|||||||
cleanup_orphaned_sources
|
cleanup_orphaned_sources
|
||||||
|
|
||||||
# Try to update package lists
|
# Try to update package lists
|
||||||
if ! apt update -qq 2>/dev/null; then
|
if ! $STD apt update; then
|
||||||
# More aggressive cleanup
|
# More aggressive cleanup
|
||||||
rm -f /etc/apt/sources.list.d/*.sources 2>/dev/null || true
|
rm -f /etc/apt/sources.list.d/*.sources 2>/dev/null || true
|
||||||
cleanup_orphaned_sources
|
cleanup_orphaned_sources
|
||||||
|
|
||||||
# Try again
|
# Try again
|
||||||
if ! apt update -qq 2>/dev/null; then
|
if ! $STD apt update; then
|
||||||
msg_error "Cannot update package lists - APT is critically broken"
|
msg_error "Cannot update package lists - APT is critically broken"
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user