Merge pull request #3920 from samsrabin/doc-builder-simplify-messaging

Simplify messaging during docs build

Author: samsrabin

.gitmodules

@@ -124,7 +124,7 @@ fxDONOTUSEurl = https://github.com/ESMCI/mpi-serial
 [submodule "doc-builder"]
 path = doc/doc-builder
 url = https://github.com/ESMCI/doc-builder
-fxtag = v3.0.1
+fxtag = v3.1.0
 fxrequired = ToplevelOptional
 # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
 fxDONOTUSEurl = https://github.com/ESMCI/doc-builder

doc/build_docs

@@ -6,10 +6,24 @@ if [ ! -f doc-builder/build_docs ]; then
     ${script_dir}/../bin/git-fleximod update doc-builder
 fi
 
-echo "Running: make fetch-images"
-make fetch-images
+# Check if --verbose or -V was passed
+verbose=false
+for arg in "$@"; do
+    case "$arg" in
+        --verbose|-V) verbose=true; break ;;
+    esac
+done
 
-echo "Running: ./doc-builder/build_docs $@"
+if $verbose; then
+    echo "Running: make fetch-images"
+    make fetch-images
+else
+    make fetch-images > /dev/null 2>&1
+fi
+
+if $verbose; then
+    echo "Running: ./doc-builder/build_docs $@"
+fi
 ./doc-builder/build_docs "$@"
 
-exit 0
+exit 0

doc/build_docs_to_publish

@@ -6,13 +6,27 @@ if [ ! -f doc-builder/build_docs_to_publish ]; then
     "${script_dir}"/../bin/git-fleximod update doc-builder
 fi
 
+# Check if --verbose or -V was passed
+verbose=false
+for arg in "$@"; do
+    case "$arg" in
+        --verbose|-V) verbose=true; break ;;
+    esac
+done
+
 cd "${script_dir}"
 
-echo "Running: make fetch-images"
-make fetch-images
+if $verbose; then
+    echo "Running: make fetch-images"
+    make fetch-images
+else
+    make fetch-images > /dev/null 2>&1
+fi
 
-echo "Running: ./doc-builder/build_docs_to_publish $@"
-pwd
+if $verbose; then
+    echo "Running: ./doc-builder/build_docs_to_publish $@"
+    pwd
+fi
 ./doc-builder/build_docs_to_publish "$@"
 
-exit 0
+exit 0