From 68a5826d7049206bacbb00bf1c05ed57e8fc9a02 Mon Sep 17 00:00:00 2001
From: James Conroy <Jconroy12@gmail.com>
Date: Tue, 8 Feb 2022 20:54:39 -0600
Subject: [PATCH] Always print a line of '-'

Even when not printing to a tty

This is behavior preferred by the team
---
 salt/common/tools/sbin/so-status | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/salt/common/tools/sbin/so-status b/salt/common/tools/sbin/so-status
index 428631b51..b4d9649f0 100755
--- a/salt/common/tools/sbin/so-status
+++ b/salt/common/tools/sbin/so-status
@@ -175,23 +175,24 @@ print_line() {
     local service_state="" ; service_state="$( parse_status "${1}" "${2}" )"
     # XXX: What will we do if tput isn't avalable?
     local line=""
+    local columns=35 # value used if not printing to a tty
+    local PADDING_CONSTANT=16 # two tabs wide
+
     if (( __tty == 1 )); then
         local NC; NC="$(tput sgr0)" # no color
-        local red=""; red="$(tput setaf 1 bold)"
+        local red; red="$(tput setaf 1 bold)"
         local green; green="$(tput setaf 2 bold)"
         local yellow; yellow="$(tput setaf 3 bold)"
 
-        # construct a line of '------' so that the names and states are all aligned
-        local PADDING_CONSTANT=16 # two tabs wide
-        PADDING_CONSTANT=$((PADDING_CONSTANT + PADDING_CONSTANT / 2))
-        local columns ; columns=$(tput cols)
-        linewidth=$(( columns - PADDING_CONSTANT - ${#service_name} - ${#service_state} ))
-
-        for i in $(seq 0 "${linewidth}"); do
-          line="${line}-"
-        done
+        columns=$(tput cols)
     fi
 
+    # construct a line of '------' so that the names and states are all aligned
+    linewidth=$(( columns - PADDING_CONSTANT - ${#service_name} - ${#service_state} ))
+    for i in $(seq 0 "${linewidth}"); do
+      line="${line}-"
+    done
+
     if [[ $service_state = "$ERROR_STRING" ]] \
         || [[ $service_state = "$MISSING_STRING" ]]; then
           state_color="${red:-}"