Merge pull request #232 from BassT23/beta

v4.5 release

Author: BassT23

.github/workflows/linting.yml

@@ -5,7 +5,7 @@ on:
     branches: [master, beta, develop]
   pull_request:
     branches: [master, beta, develop]
-  schedule:
+#   schedule:
 
 permissions: {}
 

README.md

@@ -37,12 +37,15 @@ I am no member of the Proxmox Server Solutions GmbH. This is not an official pro
 
 ### Features:
 - Update Proxmox VE (the host / all cluster nodes / all included LXCs and VMs)
+- LXC distriburion upgrade (deb12 -> deb13) with `update -dist-upgrade`
 - Snapshot / Backup support (for Snapshot, your system must prepared for it)
 - Normal run is "Interactive" / Headless Mode can be run with `update -s`
 - Logging - location can be change in config file
 - Exit tracking, so you can send additional commands for finish or failure (edit files in `/etc/ultimate-updater/exit`)
 - [Config file](https://github.com/BassT23/Proxmox/tree/master#config-file)
-- Trim filesystem on ext4 nodes - 
+- [Use TAG/ID/Range](https://github.com/BassT23/Proxmox/tree/beta#new-onlyexclude-handling-in-config-file) for "Only" / "Exclude" LXC/VM
+- send email after update/check
+- Trim filesystem on ext4 nodes
 
 Info can be found with `update -h`
 
@@ -107,7 +110,35 @@ With this file, you can manage the updater. For example; if you don't want to up
 - Headless Mode
 - Extra updates
 - "stopped" or "running" LXC/VM
-- "only" or "exclude" LXC/VM by ID
+- "only" or "exclude" LXC/VM - see below
+
+# New Only/Exclude handling in config file:
+Expands ONLY/EXCLUDE into a space-separated list of numeric VMIDs.
+Supports:
+  - Plain VMIDs: 101 202
+  - Delimiters: commas / semicolons / pipes / spaces intermixed (e.g. 101,202;203|204)
+  - Ranges: 120-125 (inclusive)
+  - Mixed IDs + ranges + tags: 110 testing 111 200-202
+  - Uppercase user tag input (config tags assumed already lowercase)
+    Tag tokens are any token not matching ^[0-9]+$ or ^[0-9]+-[0-9]+$.
+  - OR matching across tag tokens.
+
+Behavior summary:
+  1. Tokenize ONLY if set/matched; else tokenized EXCLUDE.
+  2. For each token:
+       number        -> add as VMID
+       range a-b     -> expand (a..b)
+       tag           -> collect tag for later resolution
+  3. Resolve tags to IDs (any tag match) and append, de-duplicating while
+     preserving first-seen order (input order then discovery order for tags).
+  4. Assign final space-separated list back to ONLY / EXCLUDE variable.
+  5. If ONLY provided, EXCLUDE is ignored.
+
+Usage examples:
+ - ONLY="backup,windows"
+ - ONLY="101,102,105-107"
+ - ONLY="110 testtag 111 120-121"
+ - ONLY="" EXCLUDE="old 300-302"
 
 # Extra Updates:
 If updater detects installation: (disable, if you want in `/etc/ultimate-updater/update.conf`)
@@ -117,7 +148,7 @@ If updater detects installation: (disable, if you want in `/etc/ultimate-updater
 - Octoprint
 - Docker Compose (v1 and v2)
 
-# User scripts
+# User scripts:
 How to use user scripts:
 
 In "/etc/ultimate-updater/scripts.d" create an folder for each LXC/VM who should use it like this:
@@ -136,7 +167,7 @@ The Welcome Screen is an extra for you. It's optional!
 - The Welcome-Screen brings an update-checker with it. It check on 07am and 07pm for updates via crontab. The result will show up in Welcome-Screen (Only if updates are available).
 - The update-checker also uses the config file!
 - To force the check, you can run `/etc/ultimate-updater/check-updates.sh` in Terminal.
-- You can choose, if neofetch will be show also (if neofetch is not installed, script will make it automatically)
+- You can choose, if screenfetch will be show also (if screenfetch is not installed, script will make it automatically)
 
 # Beta Testing:
 If anybody wants to help with failure search, please test our beta (if available).

change.log

@@ -1,6 +1,24 @@
 Changelog:
 ==========
 
+**v4.5** (22.08.2025)
+- add LXC debian trixie upgrade (`update -dist-upgrade`)
+- "only" or "exclude" LXC/VM by ID/TAG/range #thx to @AdamSutch
+- add debug mode (can be enabled in config file)
+- add check-updates command `update -check`
+- add email notification after update
+- add better email notification for update-check
+- add more symbolic
+- add LXC template detection
+- check "paused" VMs during update-check and bring them back in pause
+- fix #203 Error on apt clean
+- fix unsupported neofetch under trixie - change to screenfetch
+- fix #201 (abbort after template detection)
+- fix VM ID in error-log-file
+- fix shell check
+- fix typo
+- code cleaning
+
 **v4.4** (10.05.2025)
 - add symbolic
 - add user scripts folder
@@ -10,7 +28,7 @@ Changelog:
 - fix docker-compose v2 skipping
 - fix YUM Update - used now only for centos
 - fix VM shutdown errors
-- FreeBSD is disabled by default in config file
+- FreeBSD is disabled by default - in config file
 - modify "update <ID>" - disable skip output
 - code cleaning
 

check-updates.sh

@@ -4,15 +4,18 @@
 # Check Updates #
 #################
 
-# shellcheck disable=SC1017
 # shellcheck disable=SC2034
 
-VERSION="1.7"
+VERSION="1.7.7"
 
 #Variable / Function
 LOCAL_FILES="/etc/ultimate-updater"
 CONFIG_FILE="$LOCAL_FILES/update.conf"
 
+# Tag filter
+# shellcheck disable=SC1091
+. "$LOCAL_FILES/tag-filter.sh"
+
 # Colors
 BL="\e[36m"
 OR="\e[1;33m"
@@ -21,7 +24,8 @@ GN="\e[1;92m"
 CL="\e[0m"
 
 ARGUMENTS () {
-  while test $# -gt -0; do
+  local ARGUMENT
+  while [ $# -gt 0 ]; do
     ARGUMENT="$1"
     case "$ARGUMENT" in
       -c)
@@ -80,13 +84,21 @@ USAGE () {
 
 READ_WRITE_CONFIG () {
   SSH_PORT=$(awk -F'"' '/^SSH_PORT=/ {print $2}' $CONFIG_FILE)
+  EMAIL_USER=$(awk -F'"' '/^EMAIL_USER=/ {print $2}' $CONFIG_FILE)
   WITH_HOST=$(awk -F'"' '/^CHECK_WITH_HOST=/ {print $2}' $CONFIG_FILE)
   WITH_LXC=$(awk -F'"' '/^CHECK_WITH_LXC=/ {print $2}' $CONFIG_FILE)
   WITH_VM=$(awk -F'"' '/^CHECK_WITH_VM=/ {print $2}' $CONFIG_FILE)
   RUNNING=$(awk -F'"' '/^CHECK_RUNNING_CONTAINER=/ {print $2}' $CONFIG_FILE)
   STOPPED=$(awk -F'"' '/^CHECK_STOPPED_CONTAINER=/ {print $2}' $CONFIG_FILE)
+  RUNNING_VM=$(awk -F'"' '/^CHECK_RUNNING_VM=/ {print $2}' $CONFIG_FILE)
+  STOPPED_VM=$(awk -F'"' '/^CHECK_STOPPED_VM=/ {print $2}' $CONFIG_FILE)
+  PAUSED_VM=$(awk -F'"' '/^CHECK_PAUSED_VM=/ {print $2}' $CONFIG_FILE)
   EXCLUDED=$(awk -F'"' '/^EXCLUDE_UPDATE_CHECK=/ {print $2}' $CONFIG_FILE)
   ONLY=$(awk -F'"' '/^ONLY_UPDATE_CHECK=/ {print $2}' $CONFIG_FILE)
+  CHECK_URL=$(awk -F '"' '/^URL_FOR_INTERNET_CHECK=/ {print $2}' $CONFIG_FILE)
+  if declare -f apply_only_exclude_tags >/dev/null 2>&1; then
+    apply_only_exclude_tags ONLY EXCLUDED
+  fi
 }
 
 ## HOST ##
@@ -135,6 +147,8 @@ CONTAINER_CHECK_START () {
       continue
     elif [[ "$ONLY" != "" ]] && ! [[ "$ONLY" =~ $CONTAINER ]]; then
       continue
+    elif (pct config "$CONTAINER" | grep template >/dev/null 2>&1); then
+      continue
     else
       STATUS=$(pct status "$CONTAINER")
       if [[ "$STATUS" == "status: stopped" && "$STOPPED" == true ]]; then
@@ -164,9 +178,9 @@ CHECK_CONTAINER () {
   NAME=$(pct exec "$CONTAINER" hostname)
   if [[ "$OS" =~ ubuntu ]] || [[ "$OS" =~ debian ]] || [[ "$OS" =~ devuan ]]; then
     pct exec "$CONTAINER" -- bash -c "apt-get update" >/dev/null 2>&1
-    SECURITY_APT_UPDATES=$(pct exec "$CONTAINER" -- bash -c "apt-get -s upgrade | grep -ci ^inst.*security | tr -d '\n'")
-    NORMAL_APT_UPDATES=$(pct exec "$CONTAINER" -- bash -c "apt-get -s upgrade | grep -ci ^inst. | tr -d '\n'")
-#    NOT_INSTALLED=$(apt-get -s upgrade | grep -ci "^inst.*not")
+    APT_OUTPUT=$(pct exec "$CONTAINER" -- bash -c "apt-get -s upgrade")
+    SECURITY_APT_UPDATES=$(echo "$APT_OUTPUT" | grep -ci '^inst.*security' || true)
+    NORMAL_APT_UPDATES=$(echo "$APT_OUTPUT" | grep -ci '^inst.' || true)
     if [[ "$SECURITY_APT_UPDATES" -gt 0 || "$NORMAL_APT_UPDATES" != 0 ]]; then
       echo -e "${GN}LXC ${BL}$CONTAINER${CL} : ${GN}$NAME${CL}"
     fi
@@ -208,29 +222,44 @@ CHECK_CONTAINER () {
 VM_CHECK_START () {
   # Get the list of VMs
   VMS=$(qm list | tail -n +2 | cut -c -10)
-  # Loop through the VMs
+  # Loop through VMs
   for VM in $VMS; do
-    PRE_OS=$(qm config "$VM" | grep 'ostype:' | sed 's/ostype:\s*//')
-    if [[ "$ONLY" == "" && "$EXCLUDED" =~ $VM ]]; then
-      continue
-    elif [[ "$ONLY" != "" ]] && ! [[ "$ONLY" =~ $VM ]]; then
-      continue
-    elif [[ "$PRE_OS" =~ w ]]; then
-      continue
-    else
-      STATUS=$(qm status "$VM")
-      if [[ "$STATUS" == "status: stopped" && "$STOPPED" == true ]]; then
-        # Check if connection is available
-        if [[ $(qm config "$VM" | grep 'agent:' | sed 's/agent:\s*//') == 1 ]] || [[ -f $LOCAL_FILES/VMs/"$VM" ]]; then
-          # Start the VM
+    # Check if connection is available
+    if [[ $(qm config "$VM" | grep 'agent:' | sed 's/agent:\s*//') == 1 ]] || [[ -f $LOCAL_FILES/VMs/"$VM" ]]; then
+      # Check VM
+      PRE_OS=$(qm config "$VM" | grep 'ostype:' | sed 's/ostype:\s*//')
+      if [[ "$ONLY" == "" && "$EXCLUDED" =~ $VM ]]; then
+        continue
+      elif [[ "$ONLY" != "" ]] && ! [[ "$ONLY" =~ $VM ]]; then
+        continue
+      elif [[ "$PRE_OS" =~ w ]]; then
+        continue
+      else
+        STATUS=$(qm status "$VM")
+        if [[ "$STATUS" == "status: stopped" && "$STOPPED_VM" == true ]]; then
+          # Check suspend mode
+          if [[ $(qm config "$VM" | grep 'lock:' | sed 's/lock:\s*//') == "suspend" ]]; then 
+            SUSPEND=true
+            echo -e "${OR}skip suspend VM${CL}"
+            continue
+          fi
+          # Start VM
           qm start "$VM" >/dev/null 2>&1
           sleep 45
           CHECK_VM "$VM"
-          # Stop the VM
+          # Stop/Suspend VM
           qm stop "$VM"
+          SUSPEND=
+        elif [[ "$STATUS" == "status: paused" && "$PAUSED_VM" == true ]]; then
+          # Start VM
+          qm resume "$VM" >/dev/null 2>&1
+          sleep 45
+          CHECK_VM "$VM"
+          # Suspend VM
+          qm suspend "$VM"
+        elif [[ "$STATUS" == "status: running" && "$RUNNING_VM" == true ]]; then
+          CHECK_VM "$VM"
         fi
-      elif [[ "$STATUS" == "status: running" && "$RUNNING" == true ]]; then
-        CHECK_VM "$VM"
       fi
     fi
   done
@@ -259,8 +288,9 @@ CHECK_VM () {
 #        fi
         if [[ "$OS" =~ Ubuntu ]] || [[ "$OS" =~ Debian ]] || [[ "$OS" =~ Devuan ]]; then
           ssh "$IP" "apt-get update" >/dev/null 2>&1
-          SECURITY_APT_UPDATES=$(ssh "$IP" "apt-get -s upgrade | grep -ci ^inst.*security")
-          NORMAL_APT_UPDATES=$(ssh "$IP" "apt-get -s upgrade | grep -ci ^inst.")
+          APT_OUTPUT=$(ssh "$IP" "apt-get -s upgrade")
+          SECURITY_APT_UPDATES=$(echo "$APT_OUTPUT" | grep -ci '^inst.*security')
+          NORMAL_APT_UPDATES=$(echo "$APT_OUTPUT" | grep -ci '^inst.')
           if ssh "$IP" stat /var/run/reboot-required.pkgs \> /dev/null 2\>\&1; then REBOOT_REQUIRED=true; fi
           if [[ "$SECURITY_APT_UPDATES" -gt 0 || "$NORMAL_APT_UPDATES" -gt 0 || "$REBOOT_REQUIRED" == true ]]; then
             echo -e "${GN}VM ${BL}$VM${CL} : ${GN}$NAME${CL}"
@@ -356,9 +386,40 @@ OUTPUT_TO_FILE () {
   if [[ "$RDU" != true && "$RICM" != true ]]; then
     touch $LOCAL_FILES/check-output
     exec > >(tee $LOCAL_FILES/check-output)
+    # create mail output file
+    touch $LOCAL_FILES/mail-output
+    echo -e "Available Updates:"  > $LOCAL_FILES/mail-output
+    echo -e "S = Security / N = Normal\n" >> $LOCAL_FILES/mail-output
+    exec > >(tee -a $LOCAL_FILES/mail-output)
   fi
 }
 
+# Exit
+# shellcheck disable=SC2329
+EXIT () {
+  # clean email output file
+  if [[ "$RDU" != true && "$RICM" != true ]]; then
+    if [[ -f "$LOCAL_FILES/mail-output" ]]; then
+      cat "$LOCAL_FILES/mail-output" | sed -r "s/\x1B\[([0-9]{1,3}(;[0-9]{1,3})*)?[mGK]//g" | tee "$LOCAL_FILES/mail-output" >/dev/null 2>&1
+      chmod 640 "$LOCAL_FILES/mail-output"
+      if [[ $(stat -c%s "$LOCAL_FILES/mail-output") -gt 46 ]]; then
+        mail -s "Ultimate Updater summary" "$EMAIL_USER" < "$LOCAL_FILES"/mail-output
+      else
+        echo "No updates found during search" | mail -s "Ultimate Updater" root
+      fi
+    fi
+  fi
+}
+trap EXIT EXIT
+
+# Run
+
+# Debug
+DEBUG=$(awk -F'"' '/^DEBUG=/ {print $2}' $CONFIG_FILE)
+if [[ "$DEBUG" == true ]]; then
+  set -x
+fi
+
 # Check Cluster Mode
 if [[ -f /etc/corosync/corosync.conf ]]; then
   HOSTS=$(awk '/ring0_addr/{print $2}' "/etc/corosync/corosync.conf")
@@ -367,10 +428,12 @@ else
   MODE="Host"
 fi
 
-# Run
-if [[ "$(wget -q --spider http://google.com)" -eq 0 ]]; then
-  READ_WRITE_CONFIG
+# Read config
+READ_WRITE_CONFIG
+if wget -q --spider "$CHECK_URL" >/dev/null 2>&1; then
   ARGUMENTS "$@"
+  # Print any tag selection summary captured during config parse
+  if [[ "$RDU" != true && "$RICM" != true && "$TAG_OUTPUT" != false ]]; then if declare -f print_tag_log >/dev/null 2>&1; then print_tag_log; fi; fi
 else
   echo -e "${OR} You are offline${CL}"
   exit 2
@@ -379,7 +442,6 @@ fi
 # Run without commands (Automatic Mode)
 if [[ "$COMMAND" != true && "$RDU" == true ]]; then
   OUTPUT_TO_FILE
-  CHECK_RUNNUNG_MACHINE
 elif [[ "$COMMAND" != true ]]; then
   OUTPUT_TO_FILE
   if [[ "$MODE" =~ Cluster ]]; then HOST_CHECK_START; else
@@ -388,3 +450,5 @@ elif [[ "$COMMAND" != true ]]; then
     if [[ "$WITH_VM" == true ]]; then VM_CHECK_START; fi
   fi
 fi
+
+exit 0