tools.func: persist /usr/local/bin in shell PATHs

ct/zabbix.sh

@@ -35,18 +35,15 @@ function update_script() {
     exit
   fi
 
-  if systemctl cat zabbix-agent2.service &>/dev/null; then
+  if systemctl list-unit-files | grep -q zabbix-agent2.service; then
     AGENT_SERVICE="zabbix-agent2"
-  elif systemctl cat zabbix-agent.service &>/dev/null; then
-    AGENT_SERVICE="zabbix-agent"
   else
-    AGENT_SERVICE=""
-    msg_warn "No Zabbix Agent service found, skipping agent actions"
+    AGENT_SERVICE="zabbix-agent"
   fi
 
   msg_info "Stopping Services"
   systemctl stop zabbix-server
-  [[ -n "$AGENT_SERVICE" ]] && systemctl stop "$AGENT_SERVICE"
+  systemctl stop "$AGENT_SERVICE"
   msg_ok "Stopped Services"
 
   read -rp "Choose Zabbix version [1] 7.0 LTS  [2] 7.4 (Latest Stable)  [3] Latest available (default: 2): " ZABBIX_CHOICE
@@ -86,13 +83,13 @@ function update_script() {
 
   $STD apt install --only-upgrade zabbix-server-pgsql zabbix-frontend-php php8.4-pgsql
 
-  if [[ "$AGENT_SERVICE" == "zabbix-agent2" ]]; then
+  if [ "$AGENT_SERVICE" = "zabbix-agent2" ]; then
     $STD apt install --only-upgrade zabbix-agent2 zabbix-agent2-plugin-postgresql
     if [ -f /etc/zabbix/zabbix_agent2.d/plugins.d/nvidia.conf ]; then
       sed -i 's|^Plugins.NVIDIA.System.Path=.*|# Plugins.NVIDIA.System.Path=/usr/libexec/zabbix/zabbix-agent2-plugin-nvidia-gpu|' \
         /etc/zabbix/zabbix_agent2.d/plugins.d/nvidia.conf
     fi
-  elif [[ "$AGENT_SERVICE" == "zabbix-agent" ]]; then
+  else
     $STD apt install --only-upgrade zabbix-agent
   fi
 
@@ -108,7 +105,7 @@ function update_script() {
 
   msg_info "Starting Services"
   systemctl start zabbix-server
-  [[ -n "$AGENT_SERVICE" ]] && systemctl start "$AGENT_SERVICE"
+  systemctl start "$AGENT_SERVICE"
   systemctl restart apache2
   msg_ok "Started Services"
   msg_ok "Updated successfully!"

misc/alpine-tools.func

@@ -34,11 +34,19 @@ net_resolves() {
 }
 
 ensure_usr_local_bin_persist() {
+  # Login shells: /etc/profile.d/
   local PROFILE_FILE="/etc/profile.d/10-localbin.sh"
   if [ ! -f "$PROFILE_FILE" ]; then
     echo 'case ":$PATH:" in *:/usr/local/bin:*) ;; *) export PATH="/usr/local/bin:$PATH";; esac' >"$PROFILE_FILE"
     chmod +x "$PROFILE_FILE"
   fi
+
+  # Non-login shells (pct enter): /root/.profile and /root/.bashrc
+  for rc_file in /root/.profile /root/.bashrc; do
+    if [ -f "$rc_file" ] && ! grep -q '/usr/local/bin' "$rc_file"; then
+      echo 'export PATH="/usr/local/bin:$PATH"' >>"$rc_file"
+    fi
+  done
 }
 
 download_with_progress() {

misc/tools.func

@@ -1851,16 +1851,26 @@ function download_with_progress() {
 # Ensures /usr/local/bin is permanently in system PATH.
 #
 # Description:
-#   - Adds to /etc/profile.d if not present
+#   - Adds to /etc/profile.d for login shells (SSH, noVNC)
+#   - Adds to /root/.bashrc for non-login shells (pct enter)
 # ------------------------------------------------------------------------------
 
 function ensure_usr_local_bin_persist() {
-  local PROFILE_FILE="/etc/profile.d/custom_path.sh"
+  # Skip on Proxmox host
+  command -v pveversion &>/dev/null && return
 
-  if [[ ! -f "$PROFILE_FILE" ]] && ! command -v pveversion &>/dev/null; then
+  # Login shells: /etc/profile.d/
+  local PROFILE_FILE="/etc/profile.d/custom_path.sh"
+  if [[ ! -f "$PROFILE_FILE" ]]; then
     echo 'export PATH="/usr/local/bin:$PATH"' >"$PROFILE_FILE"
     chmod +x "$PROFILE_FILE"
   fi
+
+  # Non-login shells (pct enter): /root/.bashrc
+  local BASHRC="/root/.bashrc"
+  if [[ -f "$BASHRC" ]] && ! grep -q '/usr/local/bin' "$BASHRC"; then
+    echo 'export PATH="/usr/local/bin:$PATH"' >>"$BASHRC"
+  fi
 }
 
 # ------------------------------------------------------------------------------