This commit is contained in:
parent
fedda9aaad
commit
6775dc41dd
@ -46,8 +46,33 @@ if curl -fsSL https://git.community-scripts.org/community-scripts/ProxmoxVED/raw
|
|||||||
source <(curl -fsSL https://git.community-scripts.org/community-scripts/ProxmoxVED/raw/branch/main/misc/core.func) || true
|
source <(curl -fsSL https://git.community-scripts.org/community-scripts/ProxmoxVED/raw/branch/main/misc/core.func) || true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Define STD if not already defined
|
# Override STD to show all output for debugging
|
||||||
STD="${STD:-&>/dev/null}"
|
export STD=''
|
||||||
|
|
||||||
|
# Update PATH to include common installation directories
|
||||||
|
export PATH="/usr/local/bin:/usr/local/go/bin:/root/.cargo/bin:/root/.rbenv/bin:/root/.rbenv/shims:/opt/java/bin:$PATH"
|
||||||
|
|
||||||
|
# Helper functions (override if needed from core.func)
|
||||||
|
msg_info() { echo -e "${BLUE}ℹ ${1}${CL:-${NC}}"; }
|
||||||
|
msg_ok() { echo -e "${GREEN}✔ ${1}${CL:-${NC}}"; }
|
||||||
|
msg_error() { echo -e "${RED}✖ ${1}${CL:-${NC}}"; }
|
||||||
|
msg_warn() { echo -e "${YELLOW}⚠ ${1}${CL:-${NC}}"; }
|
||||||
|
|
||||||
|
# Color definitions if not already set
|
||||||
|
GN="${GN:-${GREEN}}"
|
||||||
|
BL="${BL:-${BLUE}}"
|
||||||
|
RD="${RD:-${RED}}"
|
||||||
|
YW="${YW:-${YELLOW}}"
|
||||||
|
CL="${CL:-${NC}}"
|
||||||
|
|
||||||
|
# Reload environment helper
|
||||||
|
reload_path() {
|
||||||
|
export PATH="/usr/local/bin:/usr/local/go/bin:/root/.cargo/bin:/root/.rbenv/bin:/root/.rbenv/shims:/opt/java/bin:$PATH"
|
||||||
|
# Source profile files if they exist
|
||||||
|
[ -f "/root/.bashrc" ] && source /root/.bashrc 2>/dev/null || true
|
||||||
|
[ -f "/root/.profile" ] && source /root/.profile 2>/dev/null || true
|
||||||
|
[ -f "/root/.cargo/env" ] && source /root/.cargo/env 2>/dev/null || true
|
||||||
|
}
|
||||||
|
|
||||||
# Helper functions
|
# Helper functions
|
||||||
msg_info() { echo -e "${BLUE}ℹ ${1}${NC}"; }
|
msg_info() { echo -e "${BLUE}ℹ ${1}${NC}"; }
|
||||||
@ -55,6 +80,15 @@ msg_ok() { echo -e "${GREEN}✔ ${1}${NC}"; }
|
|||||||
msg_error() { echo -e "${RED}✖ ${1}${NC}"; }
|
msg_error() { echo -e "${RED}✖ ${1}${NC}"; }
|
||||||
msg_warn() { echo -e "${YELLOW}⚠ ${1}${NC}"; }
|
msg_warn() { echo -e "${YELLOW}⚠ ${1}${NC}"; }
|
||||||
|
|
||||||
|
# Reload environment helper
|
||||||
|
reload_path() {
|
||||||
|
export PATH="/usr/local/bin:/usr/local/go/bin:/root/.cargo/bin:/root/.rbenv/bin:/root/.rbenv/shims:/opt/java/bin:$PATH"
|
||||||
|
# Source profile files if they exist
|
||||||
|
[ -f "/root/.bashrc" ] && source /root/.bashrc 2>/dev/null || true
|
||||||
|
[ -f "/root/.profile" ] && source /root/.profile 2>/dev/null || true
|
||||||
|
[ -f "/root/.cargo/env" ] && source /root/.cargo/env 2>/dev/null || true
|
||||||
|
}
|
||||||
|
|
||||||
# Test validation function
|
# Test validation function
|
||||||
test_function() {
|
test_function() {
|
||||||
local test_name="$1"
|
local test_name="$1"
|
||||||
@ -72,15 +106,19 @@ test_function() {
|
|||||||
} >>"$TEST_LOG"
|
} >>"$TEST_LOG"
|
||||||
|
|
||||||
if eval "$test_command" >>"$TEST_LOG" 2>&1; then
|
if eval "$test_command" >>"$TEST_LOG" 2>&1; then
|
||||||
|
# Reload PATH after installation
|
||||||
|
reload_path
|
||||||
|
|
||||||
if [[ -n "$validation_cmd" ]]; then
|
if [[ -n "$validation_cmd" ]]; then
|
||||||
local output
|
local output
|
||||||
if output=$(eval "$validation_cmd" 2>&1); then
|
if output=$(bash -c "$validation_cmd" 2>&1); then
|
||||||
msg_ok "${test_name} - $(echo "$output" | head -n1)"
|
msg_ok "${test_name} - $(echo "$output" | head -n1)"
|
||||||
((TESTS_PASSED++))
|
((TESTS_PASSED++))
|
||||||
else
|
else
|
||||||
msg_error "${test_name} - Installation succeeded but validation failed"
|
msg_error "${test_name} - Installation succeeded but validation failed"
|
||||||
echo "Validation command: $validation_cmd" >>"$TEST_LOG"
|
echo "Validation command: $validation_cmd" >>"$TEST_LOG"
|
||||||
echo "Validation failed" >>"$TEST_LOG"
|
echo "Validation output: $output" >>"$TEST_LOG"
|
||||||
|
echo "PATH: $PATH" >>"$TEST_LOG"
|
||||||
((TESTS_FAILED++))
|
((TESTS_FAILED++))
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user