community-scripts/ProxmoxVED
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

optimize rust function

Browse Source
This commit is contained in:
CanbiZ 2025-05-27 11:49:52 +02:00
parent 9320b52577
commit be868a04f8
1 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
misc/tools.func
View File

@ -1195,27 +1195,27 @@ setup_rbenv_stack() {
install_rust_and_crates() { install_rust_and_crates() {
local RUST_TOOLCHAIN="${RUST_TOOLCHAIN:-stable}" local RUST_TOOLCHAIN="${RUST_TOOLCHAIN:-stable}"
local RUST_CRATES="${RUST_CRATES:-}" local RUST_CRATES="${RUST_CRATES:-}"
local CARGO_BIN="${HOME}/.cargo/bin"
# Install rustup if not available # rustup & toolchain
if ! command -v rustup &>/dev/null; then if ! command -v rustup &>/dev/null; then
msg_info "Installing rustup" msg_info "Installing rustup"
curl -fsSL https://sh.rustup.rs | sh -s -- -y --default-toolchain "$RUST_TOOLCHAIN" curl -fsSL https://sh.rustup.rs | sh -s -- -y --default-toolchain "$RUST_TOOLCHAIN"
export PATH="$HOME/.cargo/bin:$PATH" export PATH="$CARGO_BIN:$PATH"
echo 'export PATH="$HOME/.cargo/bin:$PATH"' >>"$HOME/.profile" echo 'export PATH="$HOME/.cargo/bin:$PATH"' >>"$HOME/.profile"
msg_ok "Installed rustup with $RUST_TOOLCHAIN" msg_ok "Installed rustup with $RUST_TOOLCHAIN"
else else
msg_ok "rustup already installed" rustup install "$RUST_TOOLCHAIN" >/dev/null
rustup install "$RUST_TOOLCHAIN" rustup default "$RUST_TOOLCHAIN" >/dev/null
rustup update "$RUST_TOOLCHAIN" >/dev/null
msg_ok "Rust toolchain set to $RUST_TOOLCHAIN"
fi fi
rustup default "$RUST_TOOLCHAIN" # install/update crates
rustup update
# install crates
if [[ -n "$RUST_CRATES" ]]; then if [[ -n "$RUST_CRATES" ]]; then
IFS=',' read -ra CRATES <<<"$RUST_CRATES" IFS=',' read -ra CRATES <<<"$RUST_CRATES"
for crate in "${CRATES[@]}"; do for crate in "${CRATES[@]}"; do
local NAME VER local NAME VER INSTALLED_VER
if [[ "$crate" == *"@"* ]]; then if [[ "$crate" == *"@"* ]]; then
NAME="${crate%@*}" NAME="${crate%@*}"
VER="${crate##*@}" VER="${crate##*@}"
@ -1224,11 +1224,20 @@ install_rust_and_crates() {
VER="" VER=""
fi fi
if cargo install --list | grep -q "^$NAME "; then INSTALLED_VER=$(cargo install --list 2>/dev/null | awk "/^$NAME v[0-9]/ {print \$2}" | tr -d 'v')
msg_info "Crate $NAME already installed, updating"
cargo install "$NAME" ${VER:+--version "$VER"} --force if [[ -n "$INSTALLED_VER" ]]; then
if [[ -n "$VER" && "$VER" != "$INSTALLED_VER" ]]; then
msg_info "Updating $NAME from $INSTALLED_VER to $VER"
cargo install "$NAME" --version "$VER" --force
elif [[ -z "$VER" ]]; then
msg_info "Updating $NAME to latest"
cargo install "$NAME" --force
else
msg_ok "$NAME@$INSTALLED_VER already up to date"
fi
else else
msg_info "Installing crate $NAME ${VER:+($VER)}" msg_info "Installing $NAME ${VER:+($VER)}"
cargo install "$NAME" ${VER:+--version "$VER"} cargo install "$NAME" ${VER:+--version "$VER"}
fi fi
done done