From a352fd6507aea36dabc69dcf9a048e8b2ba84d51 Mon Sep 17 00:00:00 2001 From: Andrew Stevenson Date: Sun, 24 Jul 2022 22:16:04 +0000 Subject: [PATCH 1/2] Expand comment (this should have gone in a previous commit) --- usr/local/share/bastille/common.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/usr/local/share/bastille/common.sh b/usr/local/share/bastille/common.sh index de557ef9..adc1ac21 100644 --- a/usr/local/share/bastille/common.sh +++ b/usr/local/share/bastille/common.sh @@ -37,7 +37,8 @@ enable_color() { . /usr/local/share/bastille/colors.pre.sh } -# If "NO_COLOR" environment variable is present, disable output colors. +# If "NO_COLOR" environment variable is present, or we aren't speaking to a +# tty, disable output colors. if [ -z "${NO_COLOR}" -a -t 1 ]; then enable_color fi From 797f406a31a1681324fe8c1eb079a8ccb1787e85 Mon Sep 17 00:00:00 2001 From: Andrew Stevenson Date: Sun, 24 Jul 2022 22:16:38 +0000 Subject: [PATCH 2/2] Convert tab to spaces Spaces seem to be the convention for these files, for better or worse, so make things consistent. --- usr/local/share/bastille/rdr.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr/local/share/bastille/rdr.sh b/usr/local/share/bastille/rdr.sh index df0248e5..ee0514d5 100644 --- a/usr/local/share/bastille/rdr.sh +++ b/usr/local/share/bastille/rdr.sh @@ -161,7 +161,7 @@ while [ $# -gt 0 ]; do shift 3 if [ $# -gt 3 ]; then for last in $@; do - true + true done if [ $2 == "(" ] && [ $last == ")" ] ; then check_jail_validity