Commit Graph
26 Commits
Author SHA1 Message Date
91c207cd38 Update salt/common/tools/sbin/so-status
Removed # {% raw %} from line 170

Co-authored-by: William Wernert <william.wernert@gmail.com>
2022-02-17 20:37:43 -06:00
b774e62dfa Update salt/common/tools/sbin/so-status
Add salt raw directive

Co-authored-by: William Wernert <william.wernert@gmail.com>
2022-02-17 20:37:25 -06:00
James Conroy a43ac2aea2 Move the jinja endraw directive below is_tty
This will prevent jninja from interpreting the shell string length
expansion as the start of jninja comments
2022-02-12 12:25:24 -06:00
James ConroyandWilliam Wernert 95b4f7b4ef Update the PADDING_CONSTENT to 15
As suggested by @rwwiv

Co-authored-by: William Wernert <william.wernert@gmail.com>
2022-02-12 12:25:24 -06:00
James ConroyandWilliam Wernert 3046e811f0 Use spaces to define centerd justification output
As suggested by @rwwiv

Co-authored-by: William Wernert <william.wernert@gmail.com>
2022-02-12 12:25:24 -06:00
James ConroyandWilliam Wernert 6a1e586b8c Changed color variables to Attributes
As suggested by @rwwiv

Co-authored-by: William Wernert <william.wernert@gmail.com>
2022-02-12 12:25:24 -06:00
James ConroyandWilliam Wernert 01346cbb06 Changed color variables to Attributes
As suggested by @rwwiv

Co-authored-by: William Wernert <william.wernert@gmail.com>
2022-02-12 12:25:24 -06:00
James ConroyandWilliam Wernert 3adb6c1389 Renamed colors to attributes
Also correctly used tput to assign blue color

As suggested by @rwwiv

Co-authored-by: William Wernert <william.wernert@gmail.com>
2022-02-12 12:25:23 -06:00
James ConroyandWilliam Wernert dabae3888f Renamed colors to attributes
As suggested by rwwiv

Co-authored-by: William Wernert <william.wernert@gmail.com>
2022-02-12 12:25:23 -06:00
James ConroyandWilliam Wernert c69e968790 Renamed Colors to Attributes
As suggested by @rwwiv

Co-authored-by: William Wernert <william.wernert@gmail.com>
2022-02-12 12:25:23 -06:00
James ConroyandWilliam Wernert dfcabb5722 Seperate bold attribute from colors
As suggested by @rwwiv

Co-authored-by: William Wernert <william.wernert@gmail.com>
2022-02-12 12:25:23 -06:00
James Conroy b9b3876069 Exit with an error code if the user isn't root 2022-02-12 12:25:23 -06:00
James Conroy bfcfad2e7d Check for tty in main
So that the value is set every time it is checked
2022-02-12 12:25:23 -06:00
James Conroy 163182c858 Don't set the padding constant if not in a tty
This will preserve the original width from before my changes
2022-02-12 12:25:23 -06:00
James Conroy 6b4549499d Don't split lines after standalone tests
This is to make the formatting consistent with the rest of the scripts
2022-02-12 12:25:23 -06:00
James Conroy 68a5826d70 Always print a line of '-'
Even when not printing to a tty

This is behavior preferred by the team
2022-02-12 12:25:22 -06:00
James Conroy daa73c8845 Removed MYNAME variable
Preferring to just use the value of $0 instead
2022-02-12 12:25:22 -06:00
James Conroy 7f694c17ed Revert improvements to usage function
Made to make it more consistent with the rest of the scripts in
Security Onion
2022-02-12 12:25:22 -06:00
James Conroy fd9a03a77f Added Changes Suggested by Reviewer
Added a missing semi colon between a local variable's declaration and
assignment
Removed an unused return value
Made a TODO more descriptive
2022-02-12 12:25:22 -06:00
James Conroy 2993a20947 Moved line declaration out of tty conditional
This way it will always be set to ""
2022-02-12 12:25:22 -06:00
James Conroy ac5527e1ab Added Comments for future enhancements 2022-02-12 12:25:22 -06:00
James Conroy 715f9da6e2 Reworked tty detection and status printing
I was able to reduce the line count and make the script more reliable
2022-02-12 12:25:22 -06:00
James Conroy caa06b026f Refactored to reduce length and number of lines 2022-02-12 12:25:21 -06:00
James Conroy a048de65ca Print help message if not running as root 2022-02-12 12:25:21 -06:00
James Conroy f807471a17 Only print color codes if we're printing to a tty
If we're not printing to a tty the escape sequences can only clutter the
screen.

Also removed a redundant function to print lines if not printing to a
tty. It was only called if docker wasn't running, not if the output
wasn't a tty.
2022-02-12 12:25:21 -06:00
James Conroy 81122d0693 Updated the useage function to use printf
Using a hear doc means we have to exactly specify the formatting. Useing
printf handles formatting for us
2022-02-12 12:25:21 -06:00