Don't fail if shellcheck is to be installed manually

spring-cloud · Apr 9, 2019 · 4cfd698 · 4cfd698
1 parent d4e75db
commit 4cfd698
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -21,4 +21,8 @@ indent_size = 2
 
 [*.yaml]
 indent_style = space
-indent_size = 2
+indent_size = 2
+
+[*.sh]
+indent_style = space
+indent_size = 4
diff --git a/docs/src/test/bash/build-helper.sh b/docs/src/test/bash/build-helper.sh
@@ -40,10 +40,14 @@ case $1 in
             rm -vf -- "${SHELLCHECK_ARCHIVE}"
             popd
         else
-            echo "It seems that automatic installation is not supported on your platform."
-            echo "Please install shellcheck manually:"
-            echo "    https://github.com/koalaman/shellcheck#installing"
-            exit 0
+            shellcheckInstalled="false"
+            shellcheck --version && shellcheckInstalled="true" || echo "No shellcheck installed"
+            if [[ "${shellcheckInstalled}" == "false" ]]; then
+                echo "It seems that automatic installation is not supported on your platform."
+                echo "Please install shellcheck manually:"
+                echo "    https://github.com/koalaman/shellcheck#installing"
+                exit 1
+            fi
         fi
         ;;
     run-shellcheck)