From 0009f937142ee7c5edd2302ca2da4e989cb6c07f Mon Sep 17 00:00:00 2001
From: rwxrob <rob@rwx.gg>
Date: Sun, 6 Mar 2022 18:09:46 -0500
Subject: [PATCH] Add isosec and -boost to marquee

---
 scripts/countdown | 2 +-
 scripts/marquee   | 7 ++++---
 scripts/sec2dur   | 4 +++-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/scripts/countdown b/scripts/countdown
index 1ce1bb3..a22bab5 100755
--- a/scripts/countdown
+++ b/scripts/countdown
@@ -4,5 +4,5 @@ time="$*"
 [[ -z "$time" ]] && echo "usage: $0 TIME (see date -d)" && exit 1
 start=$(date "+%s" -d "$time")
 now=$(date "+%s")
-declare -i secs=$((start-now))
+declare -i secs=$((now-start))
 sec2dur "$secs"
diff --git a/scripts/marquee b/scripts/marquee
index 0b72d74..158dbdd 100755
--- a/scripts/marquee
+++ b/scripts/marquee
@@ -16,7 +16,8 @@ marquee() {
   pomo="$(pomo)"
   #mode="$(iam mode emoji)"
   zet="zet:$(zet current)"
-  time="$(date +"%A, %B %-e, %Y, %-H:%M %Z%0z")"
+  time="$(date +"%A, %B %-e, %Y, %-I:%M%p %Z%0z")"
+  isosec="$(isosec)"
   tilboost="$(countdown 11:11:11 May 4)"
   #[[ -n "$pomo" ]] && timebar+=("$pomo")
   #[[ -n "$pomo" ]] && topicbar+=("$pomo")
@@ -27,13 +28,13 @@ marquee() {
   topicremain=$(( $(tput cols) - ${#topicbarb} ))
   timeremain=$(( $(tput cols) - ${#timebarb} ))
   topicspace=$(( topicremain - ${#mode} - ${#zet}))
-  timespace=$(( timeremain - ${#mode} - ${#zet} - ${#tilboost}))
+  timespace=$(( timeremain - ${#mode} - ${#zet} - ${#tilboost} - ${#isosec}))
   #if (( $(date +%s)%20 < 10 ));then
     #echo "$topicbarb $(repeat $' ' "$topicspace")              rwxrob.tv"
   #else
     #echo "$mode $timebarb $(repeat $' ' "$timespace") rwxrob.tv $zet"
     #echo "$timebarb $replay [boost in $tilboost] $(repeat $' ' "$timespace") rwxrob.tv"
-    echo "$timebarb [boost: $tilboost]"
+    echo "$timebarb ($isosec) [boost: $tilboost]"
   #fi
 }
 
diff --git a/scripts/sec2dur b/scripts/sec2dur
index df19f99..9fab2c1 100755
--- a/scripts/sec2dur
+++ b/scripts/sec2dur
@@ -1,10 +1,12 @@
 #!/usr/bin/env bash
 seconds="$1"
 [[ -z "$seconds" ]] && echo "usage: $0 SECONDS" && exit 1
+minus=${seconds:0:1}
+seconds=${seconds#-}
 days=$((seconds/86400))
 (( seconds -= (days*86400) ))
 hours=$((seconds/3600))
 (( seconds -= (hours*3600) ))
 minutes=$((seconds/60))
 (( seconds -= (minutes*60) ))
-printf "%i.%02i.%02i.%02i" "$days" "$hours" "$minutes" "$seconds"
+printf "%s%i.%02i.%02i.%02i" "$minus" "$days" "$hours" "$minutes" "$seconds"