From 8b68b90a1d48ded448be7bb7e9e0eb6b989ad604 Mon Sep 17 00:00:00 2001 From: CanbiZ <47820557+MickLesk@users.noreply.github.com> Date: Tue, 29 Apr 2025 15:32:27 +0200 Subject: [PATCH] Update tools.func --- misc/tools.func | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/misc/tools.func b/misc/tools.func index cb05938..1da2ae3 100644 --- a/misc/tools.func +++ b/misc/tools.func @@ -786,8 +786,8 @@ function download_with_progress() { } function setup_uv() { - msg_info "Checking uv installation..." - + ensure_usr_local_bin_persist + $STD msg_info "Checking uv installation..." UV_BIN="/usr/local/bin/uv" TMP_DIR=$(mktemp -d) ARCH=$(uname -m) @@ -814,7 +814,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 @@ -822,10 +822,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 @@ -841,3 +841,14 @@ function setup_uv() { msg_ok "uv installed/updated to $LATEST_VERSION" } + +function ensure_usr_local_bin_persist() { + local PROFILE_FILE="/etc/profile.d/custom_path.sh" + + [[ ! -f "$PROFILE_FILE" ]] && { + echo 'export PATH="/usr/local/bin:$PATH"' >"$PROFILE_FILE" + chmod +x "$PROFILE_FILE" + } + + [[ ":$PATH:" != *":/usr/local/bin:"* ]] && export PATH="/usr/local/bin:$PATH" +}