Disable random quote with JBT_SHOW_QUOTE=false

muhme · Nov 13, 2024 · 8b73d2e · 8b73d2e
1 parent a54b270
commit 8b73d2e
Show file tree

Hide file tree

Showing 17 changed files with 25 additions and 49 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.0.30
+2.0.31
diff --git a/scripts/check b/scripts/check
@@ -18,9 +18,7 @@ echo "
             With the optional 'help' argument, displays this page. For full details, see https://bit.ly/JBT-README.
 
             If no filename is specified, the latest log file is used.
-
-            $(random_quote)
-"
+    $(random_quote)"
 }
 
 file=""

diff --git a/scripts/clean.sh b/scripts/clean.sh
@@ -19,9 +19,7 @@ function help {
     clean – Stops and removes all JBT Docker containers, associated Docker networks, and Docker volumes.
             Also deletes JBT directories, such as 'run' and all 'joomla-*' directories.
             The optional argument 'help' displays this page. For full details see https://bit.ly/JBT-README.
-
-            $(random_quote)
-    "
+    $(random_quote)"
 }
 
 while [ $# -ge 1 ]; do

diff --git a/scripts/create.sh b/scripts/create.sh
@@ -29,9 +29,7 @@ function help {
              The optional 'repository:branch' argument (default repository is https://github.com/joomla/joomla-cms).
              Optionally specify one or more patches (e.g., 'joomla-cypress-36'; default is unpatched).
              The optional argument 'help' displays this page. For full details see https://bit.ly/JBT-README.
-
-             $(random_quote)
-    "
+    $(random_quote)"
 }
 
 # shellcheck disable=SC2207 # There are no spaces in version numbers

diff --git a/scripts/cypress.sh b/scripts/cypress.sh
@@ -20,9 +20,7 @@ function help {
               The mandatory Joomla instance must be one of installed: ${allInstalledInstances[*]}.
               The optional 'local' argument runs Cypress on the Docker host (default is the Docker container).
               The optional argument 'help' displays this page. For full details see https://bit.ly/JBT-README.
-
-              $(random_quote)
-    "
+    $(random_quote)"
 }
 
 # shellcheck disable=SC2207 # There are no spaces in instance numbers

diff --git a/scripts/database.sh b/scripts/database.sh
@@ -59,9 +59,7 @@ function help {
                The optional 'socket' argument configures database access via Unix socket (default is TCP host).
                Optional Joomla instances can include one or more of the installed: ${allInstalledInstances[*]} (default is all).
                The optional argument 'help' displays this page. For full details see https://bit.ly/JBT-README.
-
-               $(random_quote)
-    "
+    $(random_quote)"
 }
 
 socket=false

diff --git a/scripts/graft.sh b/scripts/graft.sh
@@ -22,9 +22,7 @@ function help {
             The Joomla package file (e.g. 'Joomla_5.1.2-Stable-Full_Package.zip') is also mandatory.
             Optional database variant can be one of: ${JBT_DB_VARIANTS[*]} (default is mariadbi).
             The optional argument 'help' displays this page. For full details see https://bit.ly/JBT-README.
-
-            $(random_quote)
-    "
+    $(random_quote)"
 }
 
 # shellcheck disable=SC2207 # There are no spaces in instance numbers

diff --git a/scripts/helper.sh b/scripts/helper.sh
@@ -528,8 +528,14 @@ runningTime() {
 # A day without a smile is a wasted day. Charlie Chaplin
 # Shoot for the moon. Even if you miss, you'll land among the stars.
 #
+# Can be disable by env var JBT_SHOW_QUOTE=false
+#
 function random_quote() {
 
+  if [ "${JBT_SHOW_QUOTE}" = "false" ] || [ "${JBT_SHOW_QUOTE}" = "0" ]; then
+    return 0
+  fi
+
   # Check the LANG environment variable
   lang_code=$(echo "$LANG" | cut -c1-2 | tr '[:upper:]' '[:lower:]')
 
@@ -558,9 +564,9 @@ function random_quote() {
   if [ "${quote}" != "" ]; then
     # Print the author only if it's not "Unknown" with authorID 0
     if [ "$authorID" != "0" ]; then
-      echo "\"${quote}\", ${author}"
+      printf "\\n    \"${quote}\", ${author}\\n \\n"
     else
-      echo "\"${quote}\""
+      printf "\\n    \"${quote}\"\\n \\n"
     fi
   fi
 }

diff --git a/scripts/info b/scripts/info
@@ -20,9 +20,7 @@ function help {
            Optional Joomla instance arguments can be one or more of installed: ${allInstalledInstances[*]}.
            The optional argument 'help' displays this page. For full details see https://bit.ly/JBT-README.
            If no argument is provided, all information is displayed.
-
-           $(random_quote)
-  "
+    $(random_quote)"
 }
 
 # shellcheck disable=SC2207 # There are no spaces in instance numbers

diff --git a/scripts/patch.sh b/scripts/patch.sh
@@ -18,9 +18,7 @@ function help {
             The optional Joomla version can be one or more of: ${allInstalledInstances[*]} (default is all).
             Specify one or more patches e.g. 'joomla-cms-43968', 'joomla-cypress-33' or 'database-310'.
             The optional argument 'help' displays this page. For full details see https://bit.ly/JBT-README.
-
-            $(random_quote)
-    "
+    $(random_quote)"
 }
 
 patches=()

diff --git a/scripts/patchtester.sh b/scripts/patchtester.sh
@@ -21,9 +21,7 @@ function help {
                   Requires a GitHub personal access token as an argument (starting with 'ghp_') if 'JBT_GITHUB_TOKEN' is not set.
                   The optional Joomla version can be one or more of: ${allInstalledInstances[*]} (default is all).
                   The optional argument 'help' displays this page. For full details see https://bit.ly/JBT-README.
-
-                  $(random_quote)
-    "
+    $(random_quote)"
 }
 
 # shellcheck disable=SC2207 # There are no spaces in version numbers

diff --git a/scripts/php.sh b/scripts/php.sh
@@ -21,9 +21,7 @@ function help {
           The mandatory PHP version must be one of: ${JBT_VALID_PHP_VERSIONS[*]}.
           The optional Joomla version can include one or more of installed: ${allInstalledInstances[*]} (default is all).
           The optional argument 'help' displays this page. For full details see https://bit.ly/JBT-README.
-
-          $(random_quote)
-    "
+    $(random_quote)"
 }
 
 # shellcheck disable=SC2207 # There are no spaces in version numbers

diff --git a/scripts/pull.sh b/scripts/pull.sh
@@ -21,9 +21,7 @@ function help {
            Runs 'composer install' if changes are detected and 'npm clean install' if needed.
            Optional Joomla instance can include one or more of installed: ${allInstalledInstances[*]} (default is all).
            The optional argument 'help' displays this page. For full details see https://bit.ly/JBT-README.
-
-           $(random_quote)
-    "
+    $(random_quote)"
 }
 
 # shellcheck disable=SC2207 # There are no spaces in instance numbers

diff --git a/scripts/setup.sh b/scripts/setup.sh
@@ -24,9 +24,7 @@ function help {
                Optional initial 'socket' enables database access via Unix socket (default is TCP host).
                Optional 'unpatched' or one or multiple patches (default: ${JBT_DEFAULT_PATCHES[*]}).
                The optional argument 'help' displays this page. For full details see https://bit.ly/JBT-README.
-
-               $(random_quote)
-    "
+    $(random_quote)"
 }
 
 # Defaults to use MariaDB with MySQLi database driver, to use cache and PHP 8.1.

diff --git a/scripts/test.sh b/scripts/test.sh
@@ -29,9 +29,7 @@ function help {
            Specify an optional test name from: ${ALL_TESTS[*]} (default is all).
            Optional Cypress spec file pattern for 'system' tests (default runs all without the installation step).
            The optional argument 'help' displays this page. For full details see https://bit.ly/JBT-README.
-
-           $(random_quote)
-    "
+    $(random_quote)"
 }
 
 # shellcheck disable=SC2207 # There are no spaces in version numbers

diff --git a/scripts/versions b/scripts/versions
@@ -19,9 +19,7 @@ function help {
     versions – Displays available Joomla versions from branches and tags,
                or lists compatible PHP versions for the specified Joomla version.
                The optional argument 'help' displays this page. For full details see https://bit.ly/JBT-README.
-
-               $(random_quote)
-  "
+    $(random_quote)"
 }
 
 while [ $# -ge 1 ]; do
@@ -88,4 +86,4 @@ else
     fi
   done
 
-fi
+fi
diff --git a/scripts/xdebug.sh b/scripts/xdebug.sh
@@ -18,9 +18,7 @@ function help {
              Mandatory argument must be 'on' or 'off'.
              The optional Joomla instance can include one or more of installed: ${allInstalledInstances[*]} (default is all).
              The optional argument 'help' displays this page. For full details see https://bit.ly/JBT-README.
-
-             $(random_quote)
-    "
+    $(random_quote)"
 }
 
 # shellcheck disable=SC2207 # There are no spaces in version numbers