From 85bd9781b954b30d163ad3b691ec9f5227ab852d Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Tue, 6 Feb 2024 21:29:39 -0600 Subject: [PATCH] update --- defaults.inc | 2 +- inc/temp.inc.sh | 2 +- powerwall.sh | 38 +++++++++++++++++++------------------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/defaults.inc b/defaults.inc index 3f21c5a0..dcc63f1e 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -VERS='2.5.272-02062024' +VERS='2.5.273-02062024' noheader=' update service dailytemp confsync -r -report ' diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh index 4263c821..b8414542 100644 --- a/inc/temp.inc.sh +++ b/inc/temp.inc.sh @@ -1104,7 +1104,7 @@ SERVERROOM_TEMP_DIFFERENCE(){ -h|-help|--help) echo -e "Usage: ${idsCL[Yellow]}[powerwall or pw] tempdiff {opt}${idsCL[Default]} {" width=15 - printf "%-${width}s- %s\n" " -l|-last" "(number of last scan times to average from, defaults to ${scandefault})" + printf "%-${width}s- %s\n" " -l,-last" "(number of last scan times to average from, defaults to ${scandefault})" echo -e "}\n" exit 0;; esac diff --git a/powerwall.sh b/powerwall.sh index cf89cc89..21ff949d 100755 --- a/powerwall.sh +++ b/powerwall.sh @@ -209,8 +209,8 @@ SHUTDOWN_SERVER(){ echo -e "Usage: ${idsCL[Yellow]}pw host {host} {flags}${idsCL[Default]} {" width=35 printf "%-${width}s- %s\n" " {host}" "(*required, can either be esxiIP,idracIP or Host#)" - printf "%-${width}s- %s\n" " -p|-power {on / off}" "Controls Host Power" - printf "%-${width}s- %s\n" " -e|-esxi {off / mm}" "Shuts down ESXi or puts into maintenance mode" + printf "%-${width}s- %s\n" " -p,-power {on / off}" "Controls Host Power" + printf "%-${width}s- %s\n" " -e,-esxi {off / mm}" "Shuts down ESXi or puts into maintenance mode" echo -e "}\n" exit 0 ;; @@ -544,9 +544,9 @@ HOSTMGMT(){ echo -e "Usage: ${idsCL[Yellow]}pw host {host} {flags}${idsCL[Default]} {" width=35 printf "%-${width}s- %s\n" " {host}" "(*required if not uing -s, can either be esxiIP,idracIP or Host#)" - printf "%-${width}s- %s\n" " -p|-power {on / off}" "Controls Host Power" - printf "%-${width}s- %s\n" " -e|-esxi {off / mm}" "Shuts down ESXi or puts into maintenance mode" - printf "%-${width}s- %s\n" " -s|-status" "List all Host's Status" + printf "%-${width}s- %s\n" " -p,-power {on / off}" "Controls Host Power" + printf "%-${width}s- %s\n" " -e,-esxi {off / mm}" "Shuts down ESXi or puts into maintenance mode" + printf "%-${width}s- %s\n" " -s,-status" "List all Host's Status" echo -e "}\n" exit 0 fi @@ -795,19 +795,19 @@ fi width=35 printf "%-${width}s- %s\n" " {type}" "{power or temp} To check either power or temperatures" echo -e "\n ${idsCL[LightCyan]}power${idsCL[Default]} {flag} options" - printf "%-${width}s- %s\n" " -a, -avg {#days}" "Show average values for X number of days" - printf "%-${width}s- %s\n" " -e, -esxi" "Narrow to ESXi Hosts" - printf "%-${width}s- %s\n" " -m, -mainsite" "Narrow to Mainsite Equipment" - printf "%-${width}s- %s\n" " -o, -offsite" "Narrow to Offsite Equipment" - printf "%-${width}s- %s\n" " -p, -power" "Narrow to Power Equipment" + printf "%-${width}s- %s\n" " -a,-avg {#days}" "Show average values for X number of days" + printf "%-${width}s- %s\n" " -e,-esxi" "Narrow to ESXi Hosts" + printf "%-${width}s- %s\n" " -m,-mainsite" "Narrow to Mainsite Equipment" + printf "%-${width}s- %s\n" " -o,-offsite" "Narrow to Offsite Equipment" + printf "%-${width}s- %s\n" " -p,-power" "Narrow to Power Equipment" echo -e "\n ${idsCL[LightCyan]}temp${idsCL[Default]} {flag} options" - printf "%-${width}s- %s\n" " -a, -avg {#days}" "Show average values for X number of days" - printf "%-${width}s- %s\n" " -e, -esxi" "Narrow to ESXi Hosts Only" - printf "%-${width}s- %s\n" " -f, -fans" "Display ESXi Host Fanspeed Info" - printf "%-${width}s- %s\n" " -m, -mainsite" "Narrow to Mainsite Equipment" - printf "%-${width}s- %s\n" " -o, -offsite" "Narrow to Offsite Equipment" - printf "%-${width}s- %s\n" " -s, -search" "Narrow to search of sensor name" - printf "%-${width}s- %s\n" " -S, -sensors" "Narrow to Sensors Only" + printf "%-${width}s- %s\n" " -a,-avg {#days}" "Show average values for X number of days" + printf "%-${width}s- %s\n" " -e,-esxi" "Narrow to ESXi Hosts Only" + printf "%-${width}s- %s\n" " -f,-fans" "Display ESXi Host Fanspeed Info" + printf "%-${width}s- %s\n" " -m,-mainsite" "Narrow to Mainsite Equipment" + printf "%-${width}s- %s\n" " -o,-offsite" "Narrow to Offsite Equipment" + printf "%-${width}s- %s\n" " -s,-search" "Narrow to search of sensor name" + printf "%-${width}s- %s\n" " -S,-sensors" "Narrow to Sensors Only" echo -e "}\n" exit 0 ;; @@ -950,8 +950,8 @@ fi echo -e " ${idsCL[Yellow]} host = individual {esxi-ip}, {idrac-ip}, {hostname} or {host-number;0-9}" echo -e " ${idsCL[Yellow]} host = groups { all / mainsite / offsite / main / sys }" echo -e " ${idsCL[Yellow]} flags =" - echo -e " ${idsCL[Yellow]} -p|-power { on / off } ${idsCL[Default]}--> Controls Host Power" - echo -e " ${idsCL[Yellow]} -e|-esxi { off / mm } ${idsCL[Default]}--> Shuts down ESXi or puts into maintenance mode" + echo -e " ${idsCL[Yellow]} -p,-power { on / off } ${idsCL[Default]}--> Controls Host Power" + echo -e " ${idsCL[Yellow]} -e,-esxi { off / mm } ${idsCL[Default]}--> Shuts down ESXi or puts into maintenance mode" echo echo -e " ${idsCL[LightCyan]}iscsi-vm-shutdown${idsCL[Yellow]} {type} ${idsCL[Default]}--> Shutdown VM's running on iSCSI-(PRI or SYS) Datastore(s)" echo -e " ${idsCL[Yellow]} type = { sys / main }"