Skip to content

Commit ec53f3f

Browse files
committed
feat(html): Date added to header, footer position changed
1 parent f0177b8 commit ec53f3f

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

status.sh

+5-5
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,6 @@ MY_TIMESTAMP=$(date -u "+%s")
111111
MY_LASTRUN_TIME="0"
112112
BE_LOUD="no"
113113
BE_QUIET="no"
114-
OS_ID=$(awk -F= '$1=="ID" { print $2 ;}' /etc/os-release) # Source: https://unix.stackexchange.com/a/432819 - Author: Archemar
115114

116115
# if a config file has been specified with MY_STATUS_CONFIG=myfile use this one, otherwise default to config
117116
if [[ -z "$MY_STATUS_CONFIG" ]]; then
@@ -488,6 +487,7 @@ $MY_AUTOREFRESH_TEXT
488487
</a>
489488
</span>
490489
</h1>
490+
<span class="text-muted">$MY_DATE_TIME</span>
491491
</div>
492492
493493
<div class="d-sm-none d-md-none d-lg-none d-xl-none my-3">
@@ -504,8 +504,8 @@ function page_footer() {
504504
cat >> "$MY_STATUS_HTML" << EOF
505505
<hr class="mt-4">
506506
<footer>
507-
<p>$MY_STATUS_FOOTER</p>
508-
<p class="text-muted">$MY_DATE_TIME</p>
507+
<span class="text-muted">$MY_DATE_TIME</span>
508+
<span class="float-right d-none d-sm-block">$MY_STATUS_FOOTER</span>
509509
</footer>
510510
511511
</div>
@@ -804,7 +804,7 @@ while IFS=';' read -r MY_COMMAND MY_HOSTNAME_STRING MY_PORT || [[ -n "$MY_COMMAN
804804
# macOS: 64 = ping -n -t TIMEOUT
805805
# GNU: 2 = ping -n -w TIMEOUT (-t TTL)
806806
# OpenBSD: 1 = ping -n -w TIMEOUT (-t TTL)
807-
if [ $? -gt 2 ] || [ $OS_ID = "freebsd" ]; then
807+
if [ $? -gt 2 ] || [[ "$OSTYPE" == "freebsd"* ]]; then
808808
# BSD ping
809809
MY_PING_COMMAND='ping -n -t'
810810
else
@@ -829,7 +829,7 @@ while IFS=';' read -r MY_COMMAND MY_HOSTNAME_STRING MY_PORT || [[ -n "$MY_COMMAN
829829
# macOS: 64 = ping6 -n -t TIMEOUT
830830
# GNU: 2 = ping6 -n -w TIMEOUT (-t TTL)
831831
# OpenBSD: 1 = ping6 -n -w TIMEOUT (-t TTL)
832-
if [ $? -gt 2 ] || [ $OS_ID = "freebsd" ]; then
832+
if [ $? -gt 2 ] || [[ "$OSTYPE" == "freebsd"* ]]; then
833833
# BSD ping6
834834
MY_PING6_COMMAND='ping6 -n -t'
835835
else

0 commit comments

Comments
 (0)