From 42a341a30c6276d9fcef11ddb99d076bb3f4d590 Mon Sep 17 00:00:00 2001 From: CanbiZ <47820557+MickLesk@users.noreply.github.com> Date: Tue, 29 Apr 2025 16:20:23 +0200 Subject: [PATCH] add profile function and export PATH to prevent issues in future (#4133) --- misc/tools.func | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/misc/tools.func b/misc/tools.func index 018f5af27..76974c828 100644 --- a/misc/tools.func +++ b/misc/tools.func @@ -758,8 +758,7 @@ import_local_ip() { } function setup_uv() { - msg_info "Checking uv installation..." - + $STD msg_info "Checking uv installation..." UV_BIN="/usr/local/bin/uv" TMP_DIR=$(mktemp -d) ARCH=$(uname -m) @@ -786,7 +785,7 @@ function setup_uv() { if [[ -x "$UV_BIN" ]]; then INSTALLED_VERSION=$($UV_BIN -V | awk '{print $2}') if [[ "$INSTALLED_VERSION" == "$LATEST_VERSION" ]]; then - msg_ok "uv is already at the latest version ($INSTALLED_VERSION)" + $STD msg_ok "uv is already at the latest version ($INSTALLED_VERSION)" rm -rf "$TMP_DIR" # set path if [[ ":$PATH:" != *":/usr/local/bin:"* ]]; then @@ -794,10 +793,10 @@ function setup_uv() { fi return 0 else - msg_info "Updating uv from $INSTALLED_VERSION to $LATEST_VERSION" + $STD msg_info "Updating uv from $INSTALLED_VERSION to $LATEST_VERSION" fi else - msg_info "uv not found. Installing version $LATEST_VERSION" + $STD msg_info "uv not found. Installing version $LATEST_VERSION" fi # install or update uv @@ -807,9 +806,15 @@ function setup_uv() { rm -rf "$TMP_DIR" # set path - if [[ ":$PATH:" != *":/usr/local/bin:"* ]]; then - export PATH="/usr/local/bin:$PATH" - fi - + ensure_usr_local_bin_persist msg_ok "uv installed/updated to $LATEST_VERSION" } + +function ensure_usr_local_bin_persist() { + local PROFILE_FILE="/etc/profile.d/custom_path.sh" + + if [[ ! -f "$PROFILE_FILE" ]] && ! command -v pveversion &>/dev/null; then + echo 'export PATH="/usr/local/bin:$PATH"' >"$PROFILE_FILE" + chmod +x "$PROFILE_FILE" + fi +}