From 2b1a598fb6916aaf071921efb59530a6d85adf25 Mon Sep 17 00:00:00 2001
From: Tomas Zigo <50632337+tmszi@users.noreply.github.com>
Date: Wed, 16 Dec 2020 20:59:01 +0100
Subject: [PATCH] tools/check_addons_urls: add parameter for optional color
 text output (#366)

* tools/check_addons_urls: add parameter for optional color text output

* revert commit aa5b5b799f60981e64accb6b3a574a81e94a15ab (silence tput warning)

* tools/check_addons_urls: improve way how to catch output color text parameter argument
---
 tools/cronjobs_osgeo_lxd/check_addons_urls.sh | 42 ++++++++++++++++---
 tools/cronjobs_osgeo_lxd/cron_job_list_grass  |  2 -
 2 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/tools/cronjobs_osgeo_lxd/check_addons_urls.sh b/tools/cronjobs_osgeo_lxd/check_addons_urls.sh
index bf903b2d1e..47cbe567c5 100755
--- a/tools/cronjobs_osgeo_lxd/check_addons_urls.sh
+++ b/tools/cronjobs_osgeo_lxd/check_addons_urls.sh
@@ -14,6 +14,28 @@ log_html_file_path"
     exit 1
 fi
 
+# Colour output text
+if [ $# -eq 3 ]; then
+    COLOR_OUTPUT=1
+else
+    case $4 in
+        ''|*[!0-9]*)
+            if [[ "$4" == [tT][rR][uU][eE] ]] || [[ "$4" == [yY][eE][sS] ]]; then
+                COLOR_OUTPUT=0
+            else
+                COLOR_OUTPUT=1
+            fi
+            ;;
+        *)
+            if [ "$4" -eq 0 ]; then
+                COLOR_OUTPUT=0
+            else
+                COLOR_OUTPUT=1
+            fi
+           ;;
+    esac
+fi
+
 ADDONS_DOCS_HTML_DIR_PATH=$1
 LOG_FILE_PATH=$2
 LOG_HTML_FILE_PATH=$3
@@ -35,21 +57,31 @@ check_addon_html_manual_page() {
         echo "<tr><td><tt>$pgm</tt></td>" \
              >> "$LOG_HTML_FILE_PATH"
         if [ "$found_urls" -eq 2 ]; then
-            # Stdout, log file
-            echo "${NORMAL_COLOR}Checking $pgm... \
+            if [ "$COLOR_OUTPUT" -eq 0 ]; then
+                # Stdout, log file
+                echo "${NORMAL_COLOR}Checking $pgm... \
 source and commits URL: CORRECT" | tee -a "$LOG_FILE_PATH"
+            else
+                echo "Checking $pgm... \
+source and commits URL: CORRECT" | tee -a "$LOG_FILE_PATH"
+            fi
             # Html file
             echo "<td style=\"background-color: green\">\
 source and commits URL: CORRECT</td>" >> "$LOG_HTML_FILE_PATH"
         else
-            # Stdout, log file
-            echo "${RED_COLOR}Checking $pgm... source or \
+            if [ "$COLOR_OUTPUT" -eq 0 ]; then
+                # Stdout, log file
+                echo "${RED_COLOR}Checking $pgm... source or \
+commits URL: INCORRECT" | tee -a "$LOG_FILE_PATH"
+            else
+                echo "Checking $pgm... source or \
 commits URL: INCORRECT" | tee -a "$LOG_FILE_PATH"
+            fi
             # Html file
             echo "<td style=\"background-color: red\">\
 source or commits URL: INCORRECT</td>" >> "$LOG_HTML_FILE_PATH"
         fi;
-        tput sgr0
+        if [ "$COLOR_OUTPUT" -eq 0 ]; then tput sgr0; fi
    done;
 }
 
diff --git a/tools/cronjobs_osgeo_lxd/cron_job_list_grass b/tools/cronjobs_osgeo_lxd/cron_job_list_grass
index ed7e39e70a..a931b3c44d 100644
--- a/tools/cronjobs_osgeo_lxd/cron_job_list_grass
+++ b/tools/cronjobs_osgeo_lxd/cron_job_list_grass
@@ -6,8 +6,6 @@
 
 #MAILTO=neteler@osgeo.org
 #STDOUT=/dev/null
-# needed to silence tput in cronjob:
-TERM=xterm
 
 # +---------------- minute (0 - 59)
 # |  +------------- hour (0 - 23)