diff --git a/.metadata b/.metadata index b6e2d0b..57bf812 100644 Binary files a/.metadata and b/.metadata differ diff --git a/.templates/bin/maintenance_daily b/.templates/bin/maintenance_daily index a577a7b..bbbc13b 100755 --- a/.templates/bin/maintenance_daily +++ b/.templates/bin/maintenance_daily @@ -7,6 +7,11 @@ # Author: Kovács Zoltán # Kovács Zoltán # License: GNU/GPL v3+ (https://www.gnu.org/licenses/gpl-3.0.en.html) +# 2026-05-01 v1.1 +# new: dnf support has been added for Oracle/RHEL compatibility. +# mod: the egrep calls have been replaced by grep -E command +# for better POSIX compatibility. +# fix: 'which zpool 2>/dev/null' to omit unnecessary warnings. # 2023-06-18 v1.0 # new: forked from the "SMARTERP_skeleton" repository. # mod: "instance" => "service" @@ -55,7 +60,7 @@ if [ -n "$CRON" ]; then # Ubuntu gets the initial environment from a separate file. if [ -r "/etc/environment" ]; then # Extracts from this file, strips the right part w/o quotes. - includepath=$(cat "/etc/environment" | $(which egrep) '^PATH=') + includepath=$(cat "/etc/environment" | $(which grep) -E '^PATH=') includepath=${includepath:5} includepath="${includepath%\"}"; includepath="${includepath#\"}" [[ -n "$includepath" ]] && PATH="$PATH:$includepath" @@ -71,7 +76,7 @@ if ! [[ "$PATH" =~ '/sbin:' ]]; then PATH="$PATH:/usr/local/sbin:/usr/sbin:/sbin # TR=$(which tr 2>/dev/null) if [ -z "$TR" ]; then echo "$MSG_MISSINGDEP tr."; exit 1 ; fi -for item in basename cut df egrep head mail printf sleep +for item in basename cut df grep head mail printf sleep do if [ -n "$(which $item)" ] then export $(echo $item | "$TR" '[:lower:]' '[:upper:]')=$(which $item) @@ -92,12 +97,14 @@ if [ -x "$MAIL" ]; then [[ -x "/etc/update-motd.d/00-header" ]] \ && message+="$("/etc/update-motd.d/00-header")\n\n" message+="$("$DF" -h | "$HEAD" -n1)\n" - message+="$("$DF" -h | "$EGREP" '^/dev/' | "$EGREP" -v 'loop')\n" - if [ -n "$(which zpool)" -a -x "$(which zpool)" ]; then + message+="$("$DF" -h | "$GREP" -E '^/dev/' | "$GREP" -E -v 'loop')\n" + if [ -n "$(which zpool 2>/dev/null)" -a -x "$(which zpool 2>/dev/null)" ]; then # Includes ZFS partitions (if any). for pool in $("$(which zpool)" list -H | "$CUT" -f1) "" #" - do [[ -n "$pool" ]] && message+="$("$DF" -h | "$EGREP" "^$pool/")\n"; done + do [[ -n "$pool" ]] && message+="$("$DF" -h | "$GREP" -E "^$pool/")\n"; done fi + [[ -x "/bin/dnf" ]] \ + && message+="\n$("/bin/dnf" updateinfo summary)\n" [[ -x "/etc/update-motd.d/90-updates-available" ]] \ && message+="$("/etc/update-motd.d/90-updates-available")\n" [[ -x "/etc/update-motd.d/98-fsck-at-reboot" ]] \ @@ -105,7 +112,7 @@ if [ -x "$MAIL" ]; then [[ -x "/etc/update-motd.d/99-reboot-required" ]] \ && message+="$("/etc/update-motd.d/99-reboot-required")\n" message+="\nBest regards: the Maintenance Bot" - echo -e "$message" | "$MAIL" -s "$subject" "$USER" + echo -e "$message" | "$MAIL" -s "$subject" "$USER" fi # Done with mail.