From b3c20aec7f9bd6ab87d049a7726a2809e8a2616e Mon Sep 17 00:00:00 2001 From: Mitchell Krog Date: Sun, 19 Jan 2025 08:35:25 +0200 Subject: [PATCH] FIX Build Fails - change to TERM=linux --- dev-tools/generate-files.sh | 3 +-- dev-tools/generate-google-disavow.sh | 5 +++-- dev-tools/generate-robots.sh | 5 ++--- dev-tools/install-nginx-1.sh | 1 - dev-tools/install-nginx-2.sh | 5 ++--- dev-tools/install-nginx-3.sh | 5 ++--- dev-tools/modify-config-readme-files.sh | 5 +++-- dev-tools/modify-files-and-commit.sh | 5 ++--- dev-tools/prepare-robots-input.sh | 5 ++--- dev-tools/test-blocker-badwords.sh | 5 ++--- dev-tools/test-blocker-false-positives.sh | 9 +++++++-- dev-tools/test-blocker-quick.sh | 5 +++-- dev-tools/test-blocker-rate-limiting.sh | 5 ++--- dev-tools/test-blocker-whitelist-domains.sh | 5 ++--- dev-tools/test-blocker-whitelist-ips.sh | 7 +++---- dev-tools/test-blocker-whitelist.sh | 5 ++--- dev-tools/test-nginx-2.sh | 5 ++--- dev-tools/test-nginx-3.sh | 5 ++--- dev-tools/test-setupngxblocker.sh | 5 ++--- dev-tools/update-bad-ips.sh | 7 ++++++- 20 files changed, 50 insertions(+), 52 deletions(-) diff --git a/dev-tools/generate-files.sh b/dev-tools/generate-files.sh index 1030ee850..b9939eac7 100755 --- a/dev-tools/generate-files.sh +++ b/dev-tools/generate-files.sh @@ -43,7 +43,6 @@ set -e set -o pipefail -#export TERM=xterm export TERM=linux # ------------------------ @@ -57,7 +56,7 @@ blue=$(tput setaf 4) magenta=$(tput setaf 5) cyan=$(tput setaf 6) white=$(tput setaf 7) -#defaultcolor=$(tput setaf 7) +defaultcolor=$(tput setaf 7) # --------- # FUNCTIONS diff --git a/dev-tools/generate-google-disavow.sh b/dev-tools/generate-google-disavow.sh index dfc408c32..cdad87cac 100755 --- a/dev-tools/generate-google-disavow.sh +++ b/dev-tools/generate-google-disavow.sh @@ -43,10 +43,11 @@ export TERM=xterm # SOFTWARE. # ------------------------------------------------------------------------------ +export TERM=linux + # ------------------------ # Set Terminal Font Colors # ------------------------ - bold=$(tput bold) red=$(tput setaf 1) green=$(tput setaf 2) @@ -55,7 +56,7 @@ blue=$(tput setaf 4) magenta=$(tput setaf 5) cyan=$(tput setaf 6) white=$(tput setaf 7) -defaultcolor=$(tput setaf default) +defaultcolor=$(tput setaf 7) # --------- # Variables diff --git a/dev-tools/generate-robots.sh b/dev-tools/generate-robots.sh index 6a467902c..65f6a2b2b 100755 --- a/dev-tools/generate-robots.sh +++ b/dev-tools/generate-robots.sh @@ -45,12 +45,11 @@ set -e set -o pipefail -export TERM=xterm +export TERM=linux # ------------------------ # Set Terminal Font Colors # ------------------------ - bold=$(tput bold) red=$(tput setaf 1) green=$(tput setaf 2) @@ -59,7 +58,7 @@ blue=$(tput setaf 4) magenta=$(tput setaf 5) cyan=$(tput setaf 6) white=$(tput setaf 7) -defaultcolor=$(tput setaf default) +defaultcolor=$(tput setaf 7) # -------------- # File Variables diff --git a/dev-tools/install-nginx-1.sh b/dev-tools/install-nginx-1.sh index 9ec091b32..f32515e66 100755 --- a/dev-tools/install-nginx-1.sh +++ b/dev-tools/install-nginx-1.sh @@ -18,7 +18,6 @@ set -e set -o pipefail -#export TERM=xterm export TERM=linux # ------------------------------------------------------------------------------ diff --git a/dev-tools/install-nginx-2.sh b/dev-tools/install-nginx-2.sh index 5f6323d22..15e244699 100755 --- a/dev-tools/install-nginx-2.sh +++ b/dev-tools/install-nginx-2.sh @@ -16,7 +16,7 @@ # # ############################################################################## -export TERM=xterm +export TERM=linux # ------------------------------------------------------------------------------ # MIT License @@ -46,7 +46,6 @@ export TERM=xterm # ------------------------ # Set Terminal Font Colors # ------------------------ - bold=$(tput bold) red=$(tput setaf 1) green=$(tput setaf 2) @@ -55,7 +54,7 @@ blue=$(tput setaf 4) magenta=$(tput setaf 5) cyan=$(tput setaf 6) white=$(tput setaf 7) -defaultcolor=$(tput setaf default) +defaultcolor=$(tput setaf 7) # --------- # FUNCTIONS diff --git a/dev-tools/install-nginx-3.sh b/dev-tools/install-nginx-3.sh index 49f3511aa..92eb8b85c 100755 --- a/dev-tools/install-nginx-3.sh +++ b/dev-tools/install-nginx-3.sh @@ -16,7 +16,7 @@ # # ############################################################################## -export TERM=xterm +export TERM=linux # ------------------------------------------------------------------------------ # MIT License @@ -46,7 +46,6 @@ export TERM=xterm # ------------------------ # Set Terminal Font Colors # ------------------------ - bold=$(tput bold) red=$(tput setaf 1) green=$(tput setaf 2) @@ -55,7 +54,7 @@ blue=$(tput setaf 4) magenta=$(tput setaf 5) cyan=$(tput setaf 6) white=$(tput setaf 7) -defaultcolor=$(tput setaf default) +defaultcolor=$(tput setaf 7) # --------- # FUNCTIONS diff --git a/dev-tools/modify-config-readme-files.sh b/dev-tools/modify-config-readme-files.sh index 646a9dae1..7a7767871 100755 --- a/dev-tools/modify-config-readme-files.sh +++ b/dev-tools/modify-config-readme-files.sh @@ -43,10 +43,11 @@ export TERM=xterm # SOFTWARE. # ------------------------------------------------------------------------------ +export TERM=linux + # ------------------------ # Set Terminal Font Colors # ------------------------ - bold=$(tput bold) red=$(tput setaf 1) green=$(tput setaf 2) @@ -55,7 +56,7 @@ blue=$(tput setaf 4) magenta=$(tput setaf 5) cyan=$(tput setaf 6) white=$(tput setaf 7) -defaultcolor=$(tput setaf default) +defaultcolor=$(tput setaf 7) # --------- # Variables diff --git a/dev-tools/modify-files-and-commit.sh b/dev-tools/modify-files-and-commit.sh index 039ea2001..9d077d96e 100755 --- a/dev-tools/modify-files-and-commit.sh +++ b/dev-tools/modify-files-and-commit.sh @@ -18,7 +18,7 @@ set -e set -o pipefail -export TERM=xterm +export TERM=linux # ------------------------------------------------------------------------------ # MIT License @@ -48,7 +48,6 @@ export TERM=xterm # ------------------------ # Set Terminal Font Colors # ------------------------ - bold=$(tput bold) red=$(tput setaf 1) green=$(tput setaf 2) @@ -57,7 +56,7 @@ blue=$(tput setaf 4) magenta=$(tput setaf 5) cyan=$(tput setaf 6) white=$(tput setaf 7) -defaultcolor=$(tput setaf default) +defaultcolor=$(tput setaf 7) # --------- # Variables diff --git a/dev-tools/prepare-robots-input.sh b/dev-tools/prepare-robots-input.sh index 73f98e6d1..84fecee90 100755 --- a/dev-tools/prepare-robots-input.sh +++ b/dev-tools/prepare-robots-input.sh @@ -41,12 +41,11 @@ # SOFTWARE. # ------------------------------------------------------------------------------ -export TERM=xterm +export TERM=linux # ------------------------ # Set Terminal Font Colors # ------------------------ - bold=$(tput bold) red=$(tput setaf 1) green=$(tput setaf 2) @@ -55,7 +54,7 @@ blue=$(tput setaf 4) magenta=$(tput setaf 5) cyan=$(tput setaf 6) white=$(tput setaf 7) -defaultcolor=$(tput setaf default) +defaultcolor=$(tput setaf 7) # ------------------------------ # Specify Input and Output Files diff --git a/dev-tools/test-blocker-badwords.sh b/dev-tools/test-blocker-badwords.sh index 5e9ff8f64..9afcf02ef 100755 --- a/dev-tools/test-blocker-badwords.sh +++ b/dev-tools/test-blocker-badwords.sh @@ -16,7 +16,7 @@ # # ############################################################################## -export TERM=xterm +export TERM=linux # ------------------------------------------------------------------------------ # MIT License @@ -46,7 +46,6 @@ export TERM=xterm # ------------------------ # Set Terminal Font Colors # ------------------------ - bold=$(tput bold) red=$(tput setaf 1) green=$(tput setaf 2) @@ -55,7 +54,7 @@ blue=$(tput setaf 4) magenta=$(tput setaf 5) cyan=$(tput setaf 6) white=$(tput setaf 7) -defaultcolor=$(tput setaf default) +defaultcolor=$(tput setaf 7) # --------- # FUNCTIONS diff --git a/dev-tools/test-blocker-false-positives.sh b/dev-tools/test-blocker-false-positives.sh index fc6ccd068..ad06c8c9e 100755 --- a/dev-tools/test-blocker-false-positives.sh +++ b/dev-tools/test-blocker-false-positives.sh @@ -41,7 +41,7 @@ # SOFTWARE. # ------------------------------------------------------------------------------ -export TERM=xterm +export TERM=linux # ------------------------------------------- # For Testing REGEX and False Positives Cases @@ -51,6 +51,11 @@ export TERM=xterm # Set Terminal Font Colors # ------------------------ +export TERM=linux + +# ------------------------ +# Set Terminal Font Colors +# ------------------------ bold=$(tput bold) red=$(tput setaf 1) green=$(tput setaf 2) @@ -59,7 +64,7 @@ blue=$(tput setaf 4) magenta=$(tput setaf 5) cyan=$(tput setaf 6) white=$(tput setaf 7) -defaultcolor=$(tput setaf default) +defaultcolor=$(tput setaf 7) # ----------------------------- # USER-AGENT ARRAY - MUST MATCH diff --git a/dev-tools/test-blocker-quick.sh b/dev-tools/test-blocker-quick.sh index f8f6fbfde..a61cd0bdf 100755 --- a/dev-tools/test-blocker-quick.sh +++ b/dev-tools/test-blocker-quick.sh @@ -43,10 +43,11 @@ export TERM=xterm # SOFTWARE. # ------------------------------------------------------------------------------ +export TERM=linux + # ------------------------ # Set Terminal Font Colors # ------------------------ - bold=$(tput bold) red=$(tput setaf 1) green=$(tput setaf 2) @@ -55,7 +56,7 @@ blue=$(tput setaf 4) magenta=$(tput setaf 5) cyan=$(tput setaf 6) white=$(tput setaf 7) -defaultcolor=$(tput setaf default) +defaultcolor=$(tput setaf 7) # --------- # FUNCTIONS diff --git a/dev-tools/test-blocker-rate-limiting.sh b/dev-tools/test-blocker-rate-limiting.sh index 040f6b581..4bcb748ee 100755 --- a/dev-tools/test-blocker-rate-limiting.sh +++ b/dev-tools/test-blocker-rate-limiting.sh @@ -16,7 +16,7 @@ # # ############################################################################## -export TERM=xterm +export TERM=linux # ------------------------------------------------------------------------------ # MIT License @@ -46,7 +46,6 @@ export TERM=xterm # ------------------------ # Set Terminal Font Colors # ------------------------ - bold=$(tput bold) red=$(tput setaf 1) green=$(tput setaf 2) @@ -55,7 +54,7 @@ blue=$(tput setaf 4) magenta=$(tput setaf 5) cyan=$(tput setaf 6) white=$(tput setaf 7) -defaultcolor=$(tput setaf default) +defaultcolor=$(tput setaf 7) # --------- # FUNCTIONS diff --git a/dev-tools/test-blocker-whitelist-domains.sh b/dev-tools/test-blocker-whitelist-domains.sh index 0505f485d..8bb3fefd8 100755 --- a/dev-tools/test-blocker-whitelist-domains.sh +++ b/dev-tools/test-blocker-whitelist-domains.sh @@ -16,7 +16,7 @@ # # ############################################################################## -export TERM=xterm +export TERM=linux # ------------------------------------------------------------------------------ # MIT License @@ -46,7 +46,6 @@ export TERM=xterm # ------------------------ # Set Terminal Font Colors # ------------------------ - bold=$(tput bold) red=$(tput setaf 1) green=$(tput setaf 2) @@ -55,7 +54,7 @@ blue=$(tput setaf 4) magenta=$(tput setaf 5) cyan=$(tput setaf 6) white=$(tput setaf 7) -defaultcolor=$(tput setaf default) +defaultcolor=$(tput setaf 7) # --------- # FUNCTIONS diff --git a/dev-tools/test-blocker-whitelist-ips.sh b/dev-tools/test-blocker-whitelist-ips.sh index f6a5b5992..89a0f1c7b 100755 --- a/dev-tools/test-blocker-whitelist-ips.sh +++ b/dev-tools/test-blocker-whitelist-ips.sh @@ -16,7 +16,7 @@ # # ############################################################################## -export TERM=xterm +export TERM=linux # ------------------------------------------------------------------------------ # MIT License @@ -46,7 +46,6 @@ export TERM=xterm # ------------------------ # Set Terminal Font Colors # ------------------------ - bold=$(tput bold) red=$(tput setaf 1) green=$(tput setaf 2) @@ -55,8 +54,8 @@ blue=$(tput setaf 4) magenta=$(tput setaf 5) cyan=$(tput setaf 6) white=$(tput setaf 7) -defaultcolor=$(tput setaf default) -#thisip=$(dig +short myip.opendns.com @resolver1.opendns.com) +defaultcolor=$(tput setaf 7) + thisip=$(ip -o route get to 8.8.8.8 | sed -n 's/.*src \([0-9.]\+\).*/\1/p') # --------- diff --git a/dev-tools/test-blocker-whitelist.sh b/dev-tools/test-blocker-whitelist.sh index b32271783..4e91ad00a 100755 --- a/dev-tools/test-blocker-whitelist.sh +++ b/dev-tools/test-blocker-whitelist.sh @@ -16,7 +16,7 @@ # # ############################################################################## -export TERM=xterm +export TERM=linux # ------------------------------------------------------------------------------ # MIT License @@ -46,7 +46,6 @@ export TERM=xterm # ------------------------ # Set Terminal Font Colors # ------------------------ - bold=$(tput bold) red=$(tput setaf 1) green=$(tput setaf 2) @@ -55,7 +54,7 @@ blue=$(tput setaf 4) magenta=$(tput setaf 5) cyan=$(tput setaf 6) white=$(tput setaf 7) -defaultcolor=$(tput setaf default) +defaultcolor=$(tput setaf 7) # --------- # FUNCTIONS diff --git a/dev-tools/test-nginx-2.sh b/dev-tools/test-nginx-2.sh index 5be10c2f5..bf972b2e9 100755 --- a/dev-tools/test-nginx-2.sh +++ b/dev-tools/test-nginx-2.sh @@ -16,7 +16,7 @@ # # ############################################################################## -export TERM=xterm +export TERM=linux # ------------------------------------------------------------------------------ # MIT License @@ -46,7 +46,6 @@ export TERM=xterm # ------------------------ # Set Terminal Font Colors # ------------------------ - bold=$(tput bold) red=$(tput setaf 1) green=$(tput setaf 2) @@ -55,7 +54,7 @@ blue=$(tput setaf 4) magenta=$(tput setaf 5) cyan=$(tput setaf 6) white=$(tput setaf 7) -defaultcolor=$(tput setaf default) +defaultcolor=$(tput setaf 7) # --------- # FUNCTIONS diff --git a/dev-tools/test-nginx-3.sh b/dev-tools/test-nginx-3.sh index d78bc2a67..72fc7e8cc 100755 --- a/dev-tools/test-nginx-3.sh +++ b/dev-tools/test-nginx-3.sh @@ -41,12 +41,11 @@ # SOFTWARE. # ------------------------------------------------------------------------------ -export TERM=xterm +export TERM=linux # ------------------------ # Set Terminal Font Colors # ------------------------ - bold=$(tput bold) red=$(tput setaf 1) green=$(tput setaf 2) @@ -55,7 +54,7 @@ blue=$(tput setaf 4) magenta=$(tput setaf 5) cyan=$(tput setaf 6) white=$(tput setaf 7) -defaultcolor=$(tput setaf default) +defaultcolor=$(tput setaf 7) # --------- # FUNCTIONS diff --git a/dev-tools/test-setupngxblocker.sh b/dev-tools/test-setupngxblocker.sh index b12020d38..1e6483f23 100755 --- a/dev-tools/test-setupngxblocker.sh +++ b/dev-tools/test-setupngxblocker.sh @@ -41,12 +41,11 @@ # SOFTWARE. # ------------------------------------------------------------------------------ -export TERM=xterm +export TERM=linux # ------------------------ # Set Terminal Font Colors # ------------------------ - bold=$(tput bold) red=$(tput setaf 1) green=$(tput setaf 2) @@ -55,7 +54,7 @@ blue=$(tput setaf 4) magenta=$(tput setaf 5) cyan=$(tput setaf 6) white=$(tput setaf 7) -defaultcolor=$(tput setaf default) +defaultcolor=$(tput setaf 7) # --------- # FUNCTIONS diff --git a/dev-tools/update-bad-ips.sh b/dev-tools/update-bad-ips.sh index e801bcbba..f481e812c 100755 --- a/dev-tools/update-bad-ips.sh +++ b/dev-tools/update-bad-ips.sh @@ -32,6 +32,11 @@ # Set Terminal Font Colors # ------------------------ +export TERM=linux + +# ------------------------ +# Set Terminal Font Colors +# ------------------------ bold=$(tput bold) red=$(tput setaf 1) green=$(tput setaf 2) @@ -40,7 +45,7 @@ blue=$(tput setaf 4) magenta=$(tput setaf 5) cyan=$(tput setaf 6) white=$(tput setaf 7) -defaultcolor=$(tput setaf default) +defaultcolor=$(tput setaf 7) # --------- # Variables