X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=system-status;h=87d8cf9d7939df5b2b55175e10015cca1d0f0f4f;hb=b37f31cdee02eab5a7a9bb083688c0a90a973e31;hp=cd603ca57e4f982e149107d2aef856ccffb46451;hpb=9ac513d1086f22a8dede2ebe3ca0236443bdc429;p=distro-setup diff --git a/system-status b/system-status index cd603ca..87d8cf9 100755 --- a/system-status +++ b/system-status @@ -68,7 +68,7 @@ write-status() { dynamicipupdate ) bads=() - if systemctl show -p SubState --value ${services[@]} | egrep -v '^(running|)$' &>/dev/null; then + if systemctl show -p SubState --value ${services[@]} | grep -E -v '^(running|)$' &>/dev/null; then for s in ${services[@]}; do if [[ $(systemctl show -p SubState --value $s 2>&1) != running ]]; then bads+=($s) @@ -88,7 +88,7 @@ write-status() { prometheus ) bads=() - if systemctl show -p SubState --value ${services[@]} | egrep -v '^(running|)$' &>/dev/null; then + if systemctl show -p SubState --value ${services[@]} | grep -E -v '^(running|)$' &>/dev/null; then for s in ${services[@]}; do if [[ $(systemctl show -p SubState --value $s 2>&1) != running ]]; then bads+=($s) @@ -140,13 +140,13 @@ write-status() { # PS4='+ $(date "+%2N") ' # allow failure in case there are no snapshots yet. # shellcheck disable=SC2012 - shopt -u nullglob - files=($btrbk_root/$vol.20*) shopt -s nullglob - snaps=() - if (( ${#files[@]} )); then - snaps=($(ls -1avdr "${files[@]}" 2>/dev/null |head -n1 || : )) + files=($btrbk_root/$vol.20*) + shopt -u nullglob + if (( ! ${#files[@]} )); then + continue fi + snaps=($(ls -1avdr "${files[@]}" 2>/dev/null |head -n1 || : )) now=$EPOCHSECONDS maxtime=0 for s in ${snaps[@]}; do @@ -228,7 +228,7 @@ write-status() { # this is for tracking dns over tls issue, which # fixvpndns() in brc2 fixes. stat=$(resolvectl dnsovertls tunfsf 2>/dev/null ||: ) - read _ _ _ istls <<<"$stat" + read -r _ _ _ istls <<<"$stat" case $istls in no) : ;; *) @@ -382,10 +382,44 @@ write-status() { fi fi } + +# This prevents me having to mute notifications when I'm going to bed. +mute() { + local locked + export DISPLAY=:0 + locked=false + if lock_info=$(xscreensaver-command -time); then + if [[ $lock_info != *non-blanked* ]]; then + locked=true + fi + else + locked=true + fi + midnight=$(date -d 00:00 +%s) + mdiff=$(( EPOCHSECONDS - midnight )) + if $locked && (( mdiff < 6 || mdiff > 21 )); then + case $(pactl get-sink-mute @DEFAULT_SINK@ | awk '{print $2}') in + no) + # for log purposes + echo unmuted + pactl set-sink-mute @DEFAULT_SINK@ true + ;; + esac + fi + if ! $locked && (( mdiff > 6 || mdiff < 12 )) && [[ ! -e /tmp/ianknap ]]; then + case $(pactl get-sink-mute @DEFAULT_SINK@ | awk '{print $2}') in + yes) + # for log purposes + echo muted + pactl set-sink-mute @DEFAULT_SINK@ false + ;; + esac + fi +} + # use this if we want to do something just once per minute first_chars=() - write-status if [[ $1 ]]; then cat $status_file @@ -408,6 +442,7 @@ main-loop() { sleep $wait write-status + mute done }