From 17159df36bf9917e4a91ff12f695dbbaf95fed88 Mon Sep 17 00:00:00 2001 From: Martinski <119833648+Martinski4GitHub@users.noreply.github.com> Date: Sun, 29 Sep 2024 21:49:04 -0700 Subject: [PATCH] Code improvements. --- scmerlin.sh | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/scmerlin.sh b/scmerlin.sh index 8b5f8a4..f4e72da 100644 --- a/scmerlin.sh +++ b/scmerlin.sh @@ -915,23 +915,22 @@ EOF } ##----------------------------------------## -## Modified by Martinski W. [2024-May-25] ## +## Modified by Martinski W. [2024-Sep-29] ## ##----------------------------------------## Get_Cron_Jobs() { printf "%-27s┌────────── minute (0 - 59)\\n" " " - printf "%-27s│%-8s┌──────── hour (0 - 23)\\n" " " " " - printf "%-27s│%-8s│%-8s┌────── day of month (1 - 31)\\n" " " " " " " - printf "%-27s│%-8s│%-8s│%-8s┌──── month (1 - 12)\\n" " " " " " " " " - printf "%-27s│%-8s│%-8s│%-8s│%-8s┌── day of week (0 - 6 => Sunday - Saturday)\\n" " " " " " " " " " " - printf "%-27s│%-8s│%-8s│%-8s│%-8s│\\n" " " " " " " " " " " - printf "%-27s↓%-8s↓%-8s↓%-8s↓%-8s↓\\n" " " " " " " " " " " - printf "${GRNct}%-25s %-8s %-8s %-8s %-8s %-9s %s${CLEARFORMAT}\n" \ - "Cron job name" "Min" "Hour" "DayM" "Month" "DayW" "Command" + printf "%-27s│%-9s┌──────── hour (0 - 23)\\n" " " " " + printf "%-27s│%-9s│%-9s┌────── day of month (1 - 31)\\n" " " " " " " + printf "%-27s│%-9s│%-9s│%-9s┌──── month (1 - 12)\\n" " " " " " " " " + printf "%-27s│%-9s│%-9s│%-9s│%-9s┌── day of week (0 - 6 => Sunday - Saturday)\\n" " " " " " " " " " " + printf "%-27s│%-9s│%-9s│%-9s│%-9s│\\n" " " " " " " " " " " + printf "%-27s↓%-9s↓%-9s↓%-9s↓%-9s↓\\n" " " " " " " " " " " + printf "${GRNct}%-25s %-9s %-9s %-9s %-9s %-10s %s${CLEARFORMAT}\n" "Cron Job Name" "Min" "Hour" "DayM" "Month" "DayW" "Command" + cronjobs="$(eval $cronListCmd | awk 'FS="#" {printf "%s %s\n",$2,$1}' | awk '{printf "%-25s %-9s %-9s %-9s %-9s %-10s ",$1,$2,$3,$4,$5,$6;for(i=7; i<=NF; ++i) printf "%s ", $i; print ""}')" + echo "$cronjobs" eval $cronListCmd | sed 's/,/|/g' | awk 'FS="#" {printf "%s %s\n",$2,$1}' | \ awk '{printf "\"%s\",\"%s\",\"%s\",\"%s\",\"%s\",\"%s\",\"",$1,$2,$3,$4,$5,$6;for(i=7; i<=NF; ++i) printf "%s ", $i; print "\""}' | sed 's/ "$/"/g' > /tmp/scmcronjobs.tmp - cronjobs="$(eval $cronListCmd | awk 'FS="#" {printf "%s %s\n",$2,$1}' | awk '{printf "%-25s %-8s %-8s %-8s %-8s %-10s",$1,$2,$3,$4,$5,$6;for(i=7; i<=NF; ++i) printf "%s ", $i; print ""}')" - echo "$cronjobs" } Get_Addon_Pages(){