From d30ef91f8704b01262f250fffa50a42db51c0841 Mon Sep 17 00:00:00 2001
From: Markus Linnala <Markus.Linnala@knowit.fi>
Date: Wed, 16 Mar 2022 16:24:12 +0200
Subject: [PATCH 1/2] products/jre: silence shellcheck SC2174

Example of the same issue:

In build/jre/fixes/bash/java_jre_unsigned_applications.sh line 8:
  mkdir -p -m 755 ${JAVA_DIR}
           ^-- SC2174: When used with -p, -m only applies to the deepest directory.

For more information:
  https://www.shellcheck.net/wiki/SC2174 -- When used with -p, -m only applie...

When using mkdir -p there is no need to check if directory exists.

Other possible solution is to drop -m option.
---
 .../java_jre_accepted_sites_exists/bash/jre.sh             | 5 ++---
 .../java_jre_accepted_sites_properties/bash/jre.sh         | 5 ++---
 .../jre/guide/java/java_jre_blacklist_check/bash/jre.sh    | 5 ++---
 .../guide/java/java_jre_blacklist_check_locked/bash/jre.sh | 5 ++---
 .../java_jre_deployment_config_exists/bash/jre.sh          | 7 +++----
 .../java_jre_deployment_config_mandatory/bash/jre.sh       | 5 ++---
 .../java_jre_deployment_config_properties/bash/jre.sh      | 5 ++---
 .../java/java_jre_deployment_properties_exists/bash/jre.sh | 5 ++---
 .../java/java_jre_disable_untrusted_sources/bash/jre.sh    | 5 ++---
 .../java_jre_disable_untrusted_sources_locked/bash/jre.sh  | 5 ++---
 products/jre/guide/java/java_jre_enable_jws/bash/jre.sh    | 5 ++---
 .../jre/guide/java/java_jre_enable_jws_locked/bash/jre.sh  | 5 ++---
 .../jre/guide/java/java_jre_insecure_prompt/bash/jre.sh    | 5 ++---
 .../guide/java/java_jre_insecure_prompt_locked/bash/jre.sh | 5 ++---
 .../guide/java/java_jre_lock_untrusted_sources/bash/jre.sh | 5 ++---
 .../java_jre_lock_untrusted_sources_locked/bash/jre.sh     | 5 ++---
 .../java/java_jre_security_revocation_check/bash/jre.sh    | 5 ++---
 .../java_jre_security_revocation_check_locked/bash/jre.sh  | 5 ++---
 .../guide/java/java_jre_unsigned_applications/bash/jre.sh  | 5 ++---
 .../java/java_jre_unsigned_applications_locked/bash/jre.sh | 5 ++---
 .../jre/guide/java/java_jre_validation_crl/bash/jre.sh     | 5 ++---
 .../guide/java/java_jre_validation_crl_locked/bash/jre.sh  | 5 ++---
 .../jre/guide/java/java_jre_validation_ocsp/bash/jre.sh    | 5 ++---
 .../guide/java/java_jre_validation_ocsp_locked/bash/jre.sh | 5 ++---
 24 files changed, 49 insertions(+), 73 deletions(-)

diff --git a/products/jre/guide/java/java_jre_accepted_sites_configured/java_jre_accepted_sites_exists/bash/jre.sh b/products/jre/guide/java/java_jre_accepted_sites_configured/java_jre_accepted_sites_exists/bash/jre.sh
index 75e65931ad5..7f392cc9486 100644
--- a/products/jre/guide/java/java_jre_accepted_sites_configured/java_jre_accepted_sites_exists/bash/jre.sh
+++ b/products/jre/guide/java/java_jre_accepted_sites_configured/java_jre_accepted_sites_exists/bash/jre.sh
@@ -2,9 +2,8 @@
 JAVA_FILE="/etc/.java/deployment/exception.sites"
 JAVA_DIR="/etc/.java/deployment"
 
-if [ ! -d ${JAVA_DIR} ] ; then
-  mkdir -p -m 755 ${JAVA_DIR}
-fi
+# shellcheck disable=SC2174
+mkdir -p -m 755 ${JAVA_DIR}
 
 if [ ! -e ${JAVA_FILE} ]; then
   touch ${JAVA_FILE} && chmod 644 ${JAVA_FILE}
diff --git a/products/jre/guide/java/java_jre_accepted_sites_configured/java_jre_accepted_sites_properties/bash/jre.sh b/products/jre/guide/java/java_jre_accepted_sites_configured/java_jre_accepted_sites_properties/bash/jre.sh
index bac5c464b9b..76fe0b49643 100644
--- a/products/jre/guide/java/java_jre_accepted_sites_configured/java_jre_accepted_sites_properties/bash/jre.sh
+++ b/products/jre/guide/java/java_jre_accepted_sites_configured/java_jre_accepted_sites_properties/bash/jre.sh
@@ -2,9 +2,8 @@
 JAVA_PROPERTIES="/etc/.java/deployment/deployment.properties"
 JAVA_DIR="/etc/.java/deployment"
 
-if [ ! -d ${JAVA_DIR} ] ; then
-  mkdir -p -m 755 ${JAVA_DIR}
-fi
+# shellcheck disable=SC2174
+mkdir -p -m 755 ${JAVA_DIR}
 
 if [ ! -e ${JAVA_PROPERTIES} ]; then
   touch ${JAVA_PROPERTIES} && chmod 644 ${JAVA_PROPERTIES}
diff --git a/products/jre/guide/java/java_jre_blacklist_check/bash/jre.sh b/products/jre/guide/java/java_jre_blacklist_check/bash/jre.sh
index 89c1cf2f94b..cce230ef5ce 100644
--- a/products/jre/guide/java/java_jre_blacklist_check/bash/jre.sh
+++ b/products/jre/guide/java/java_jre_blacklist_check/bash/jre.sh
@@ -2,9 +2,8 @@
 JAVA_PROPERTIES="/etc/.java/deployment/deployment.properties"
 JAVA_DIR="/etc/.java/deployment"
 
-if [ ! -d ${JAVA_DIR} ] ; then
-  mkdir -p -m 755 ${JAVA_DIR}
-fi
+# shellcheck disable=SC2174
+mkdir -p -m 755 ${JAVA_DIR}
 
 if [ ! -e ${JAVA_PROPERTIES} ]; then
   touch ${JAVA_PROPERTIES} && chmod 644 ${JAVA_PROPERTIES}
diff --git a/products/jre/guide/java/java_jre_blacklist_check_locked/bash/jre.sh b/products/jre/guide/java/java_jre_blacklist_check_locked/bash/jre.sh
index 782a3e37bc3..2b07ee61aa0 100644
--- a/products/jre/guide/java/java_jre_blacklist_check_locked/bash/jre.sh
+++ b/products/jre/guide/java/java_jre_blacklist_check_locked/bash/jre.sh
@@ -2,9 +2,8 @@
 JAVA_PROPERTIES="/etc/.java/deployment/deployment.properties"
 JAVA_DIR="/etc/.java/deployment"
 
-if [ ! -d ${JAVA_DIR} ] ; then
-  mkdir -p -m 755 ${JAVA_DIR}
-fi
+# shellcheck disable=SC2174
+mkdir -p -m 755 ${JAVA_DIR}
 
 if [ ! -e ${JAVA_PROPERTIES} ]; then
   touch ${JAVA_PROPERTIES} && chmod 644 ${JAVA_PROPERTIES}
diff --git a/products/jre/guide/java/java_jre_deployment_config_configured/java_jre_deployment_config_exists/bash/jre.sh b/products/jre/guide/java/java_jre_deployment_config_configured/java_jre_deployment_config_exists/bash/jre.sh
index 4fa97d83de1..2de07251d88 100644
--- a/products/jre/guide/java/java_jre_deployment_config_configured/java_jre_deployment_config_exists/bash/jre.sh
+++ b/products/jre/guide/java/java_jre_deployment_config_configured/java_jre_deployment_config_exists/bash/jre.sh
@@ -2,12 +2,11 @@
 JAVA_CONFIG="/etc/.java/deployment/deployment.config"
 JAVA_DIR="/etc/.java/deployment"
 
-if [ ! -d ${JAVA_DIR} ] ; then
-  mkdir -p -m 755 ${JAVA_DIR}
-fi
+# shellcheck disable=SC2174
+mkdir -p -m 755 ${JAVA_DIR}
 
 if [ ! -e ${JAVA_CONFIG} ]; then
   touch ${JAVA_CONFIG} && chmod 644 ${JAVA_CONFIG}
 fi
 
-chmod 644 ${JAVA_CONFIG}
\ No newline at end of file
+chmod 644 ${JAVA_CONFIG}
diff --git a/products/jre/guide/java/java_jre_deployment_config_configured/java_jre_deployment_config_mandatory/bash/jre.sh b/products/jre/guide/java/java_jre_deployment_config_configured/java_jre_deployment_config_mandatory/bash/jre.sh
index 884b4dcecf7..7a103e8f227 100644
--- a/products/jre/guide/java/java_jre_deployment_config_configured/java_jre_deployment_config_mandatory/bash/jre.sh
+++ b/products/jre/guide/java/java_jre_deployment_config_configured/java_jre_deployment_config_mandatory/bash/jre.sh
@@ -2,9 +2,8 @@
 JAVA_CONFIG="/etc/.java/deployment/deployment.config"
 JAVA_DIR="/etc/.java/deployment"
 
-if [ ! -d ${JAVA_DIR} ] ; then
-  mkdir -p -m 755 ${JAVA_DIR}
-fi
+# shellcheck disable=SC2174
+mkdir -p -m 755 ${JAVA_DIR}
 
 if [ ! -e ${JAVA_CONFIG} ]; then
   touch ${JAVA_CONFIG} && chmod 644 ${JAVA_CONFIG}
diff --git a/products/jre/guide/java/java_jre_deployment_config_configured/java_jre_deployment_config_properties/bash/jre.sh b/products/jre/guide/java/java_jre_deployment_config_configured/java_jre_deployment_config_properties/bash/jre.sh
index d7093af391e..2f25f5e59af 100644
--- a/products/jre/guide/java/java_jre_deployment_config_configured/java_jre_deployment_config_properties/bash/jre.sh
+++ b/products/jre/guide/java/java_jre_deployment_config_configured/java_jre_deployment_config_properties/bash/jre.sh
@@ -2,9 +2,8 @@
 JAVA_CONFIG="/etc/.java/deployment/deployment.config"
 JAVA_DIR="/etc/.java/deployment"
 
-if [ ! -d ${JAVA_DIR} ] ; then
-  mkdir -p -m 755 ${JAVA_DIR}
-fi
+# shellcheck disable=SC2174
+mkdir -p -m 755 ${JAVA_DIR}
 
 if [ ! -e ${JAVA_CONFIG} ]; then
   touch ${JAVA_CONFIG} && chmod 644 ${JAVA_CONFIG}
diff --git a/products/jre/guide/java/java_jre_deployment_properties_exists/bash/jre.sh b/products/jre/guide/java/java_jre_deployment_properties_exists/bash/jre.sh
index 18a74a556d8..7681949bf96 100644
--- a/products/jre/guide/java/java_jre_deployment_properties_exists/bash/jre.sh
+++ b/products/jre/guide/java/java_jre_deployment_properties_exists/bash/jre.sh
@@ -2,9 +2,8 @@
 JAVA_PROPERTIES="/etc/.java/deployment/deployment.properties"
 JAVA_DIR="/etc/.java/deployment"
 
-if [ ! -d ${JAVA_DIR} ] ; then
-  mkdir -p -m 755 ${JAVA_DIR}
-fi
+# shellcheck disable=SC2174
+mkdir -p -m 755 ${JAVA_DIR}
 
 if [ ! -e ${JAVA_PROPERTIES} ]; then
   touch ${JAVA_PROPERTIES} && chmod 644 ${JAVA_PROPERTIES}
diff --git a/products/jre/guide/java/java_jre_disable_untrusted_sources/bash/jre.sh b/products/jre/guide/java/java_jre_disable_untrusted_sources/bash/jre.sh
index 5ef5ee650fc..f0b5df1fa08 100644
--- a/products/jre/guide/java/java_jre_disable_untrusted_sources/bash/jre.sh
+++ b/products/jre/guide/java/java_jre_disable_untrusted_sources/bash/jre.sh
@@ -2,9 +2,8 @@
 JAVA_PROPERTIES="/etc/.java/deployment/deployment.properties"
 JAVA_DIR="/etc/.java/deployment"
 
-if [ ! -d ${JAVA_DIR} ] ; then
-  mkdir -p -m 755 ${JAVA_DIR}
-fi
+# shellcheck disable=SC2174
+mkdir -p -m 755 ${JAVA_DIR}
 
 if [ ! -e ${JAVA_PROPERTIES} ]; then
   touch ${JAVA_PROPERTIES} && chmod 644 ${JAVA_PROPERTIES}
diff --git a/products/jre/guide/java/java_jre_disable_untrusted_sources_locked/bash/jre.sh b/products/jre/guide/java/java_jre_disable_untrusted_sources_locked/bash/jre.sh
index 75390d8cb4f..d29e925dd3b 100644
--- a/products/jre/guide/java/java_jre_disable_untrusted_sources_locked/bash/jre.sh
+++ b/products/jre/guide/java/java_jre_disable_untrusted_sources_locked/bash/jre.sh
@@ -2,9 +2,8 @@
 JAVA_PROPERTIES="/etc/.java/deployment/deployment.properties"
 JAVA_DIR="/etc/.java/deployment"
 
-if [ ! -d ${JAVA_DIR} ] ; then
-  mkdir -p -m 755 ${JAVA_DIR}
-fi
+# shellcheck disable=SC2174
+mkdir -p -m 755 ${JAVA_DIR}
 
 if [ ! -e ${JAVA_PROPERTIES} ]; then
   touch ${JAVA_PROPERTIES} && chmod 644 ${JAVA_PROPERTIES}
diff --git a/products/jre/guide/java/java_jre_enable_jws/bash/jre.sh b/products/jre/guide/java/java_jre_enable_jws/bash/jre.sh
index 9228487a6f2..29738ce4477 100644
--- a/products/jre/guide/java/java_jre_enable_jws/bash/jre.sh
+++ b/products/jre/guide/java/java_jre_enable_jws/bash/jre.sh
@@ -2,9 +2,8 @@
 JAVA_PROPERTIES="/etc/.java/deployment/deployment.properties"
 JAVA_DIR="/etc/.java/deployment"
 
-if [ ! -d ${JAVA_DIR} ] ; then
-  mkdir -p -m 755 ${JAVA_DIR}
-fi
+# shellcheck disable=SC2174
+mkdir -p -m 755 ${JAVA_DIR}
 
 if [ ! -e ${JAVA_PROPERTIES} ]; then
   touch ${JAVA_PROPERTIES} && chmod 644 ${JAVA_PROPERTIES}
diff --git a/products/jre/guide/java/java_jre_enable_jws_locked/bash/jre.sh b/products/jre/guide/java/java_jre_enable_jws_locked/bash/jre.sh
index 782a3e37bc3..2b07ee61aa0 100644
--- a/products/jre/guide/java/java_jre_enable_jws_locked/bash/jre.sh
+++ b/products/jre/guide/java/java_jre_enable_jws_locked/bash/jre.sh
@@ -2,9 +2,8 @@
 JAVA_PROPERTIES="/etc/.java/deployment/deployment.properties"
 JAVA_DIR="/etc/.java/deployment"
 
-if [ ! -d ${JAVA_DIR} ] ; then
-  mkdir -p -m 755 ${JAVA_DIR}
-fi
+# shellcheck disable=SC2174
+mkdir -p -m 755 ${JAVA_DIR}
 
 if [ ! -e ${JAVA_PROPERTIES} ]; then
   touch ${JAVA_PROPERTIES} && chmod 644 ${JAVA_PROPERTIES}
diff --git a/products/jre/guide/java/java_jre_insecure_prompt/bash/jre.sh b/products/jre/guide/java/java_jre_insecure_prompt/bash/jre.sh
index 690d2e86d9e..412c20b9c2f 100644
--- a/products/jre/guide/java/java_jre_insecure_prompt/bash/jre.sh
+++ b/products/jre/guide/java/java_jre_insecure_prompt/bash/jre.sh
@@ -2,9 +2,8 @@
 JAVA_PROPERTIES="/etc/.java/deployment/deployment.properties"
 JAVA_DIR="/etc/.java/deployment"
 
-if [ ! -d ${JAVA_DIR} ] ; then
-  mkdir -p -m 755 ${JAVA_DIR}
-fi
+# shellcheck disable=SC2174
+mkdir -p -m 755 ${JAVA_DIR}
 
 if [ ! -e ${JAVA_PROPERTIES} ]; then
   touch ${JAVA_PROPERTIES} && chmod 644 ${JAVA_PROPERTIES}
diff --git a/products/jre/guide/java/java_jre_insecure_prompt_locked/bash/jre.sh b/products/jre/guide/java/java_jre_insecure_prompt_locked/bash/jre.sh
index 822c77fcae2..6588c63e4fe 100644
--- a/products/jre/guide/java/java_jre_insecure_prompt_locked/bash/jre.sh
+++ b/products/jre/guide/java/java_jre_insecure_prompt_locked/bash/jre.sh
@@ -2,9 +2,8 @@
 JAVA_PROPERTIES="/etc/.java/deployment/deployment.properties"
 JAVA_DIR="/etc/.java/deployment"
 
-if [ ! -d ${JAVA_DIR} ] ; then
-  mkdir -p -m 755 ${JAVA_DIR}
-fi
+# shellcheck disable=SC2174
+mkdir -p -m 755 ${JAVA_DIR}
 
 if [ ! -e ${JAVA_PROPERTIES} ]; then
   touch ${JAVA_PROPERTIES} && chmod 644 ${JAVA_PROPERTIES}
diff --git a/products/jre/guide/java/java_jre_lock_untrusted_sources/bash/jre.sh b/products/jre/guide/java/java_jre_lock_untrusted_sources/bash/jre.sh
index 48437da67e2..64086c2c574 100644
--- a/products/jre/guide/java/java_jre_lock_untrusted_sources/bash/jre.sh
+++ b/products/jre/guide/java/java_jre_lock_untrusted_sources/bash/jre.sh
@@ -2,9 +2,8 @@
 JAVA_PROPERTIES="/etc/.java/deployment/deployment.properties"
 JAVA_DIR="/etc/.java/deployment"
 
-if [ ! -d ${JAVA_DIR} ] ; then
-  mkdir -p -m 755 ${JAVA_DIR}
-fi
+# shellcheck disable=SC2174
+mkdir -p -m 755 ${JAVA_DIR}
 
 if [ ! -e ${JAVA_PROPERTIES} ]; then
   touch ${JAVA_PROPERTIES} && chmod 644 ${JAVA_PROPERTIES}
diff --git a/products/jre/guide/java/java_jre_lock_untrusted_sources_locked/bash/jre.sh b/products/jre/guide/java/java_jre_lock_untrusted_sources_locked/bash/jre.sh
index 6c328d92622..a24f840f2a8 100644
--- a/products/jre/guide/java/java_jre_lock_untrusted_sources_locked/bash/jre.sh
+++ b/products/jre/guide/java/java_jre_lock_untrusted_sources_locked/bash/jre.sh
@@ -2,9 +2,8 @@
 JAVA_PROPERTIES="/etc/.java/deployment/deployment.properties"
 JAVA_DIR="/etc/.java/deployment"
 
-if [ ! -d ${JAVA_DIR} ] ; then
-  mkdir -p -m 755 ${JAVA_DIR}
-fi
+# shellcheck disable=SC2174
+mkdir -p -m 755 ${JAVA_DIR}
 
 if [ ! -e ${JAVA_PROPERTIES} ]; then
   touch ${JAVA_PROPERTIES} && chmod 644 ${JAVA_PROPERTIES}
diff --git a/products/jre/guide/java/java_jre_security_revocation_check/bash/jre.sh b/products/jre/guide/java/java_jre_security_revocation_check/bash/jre.sh
index 8c70bdc9024..121abf0ba9c 100644
--- a/products/jre/guide/java/java_jre_security_revocation_check/bash/jre.sh
+++ b/products/jre/guide/java/java_jre_security_revocation_check/bash/jre.sh
@@ -2,9 +2,8 @@
 JAVA_PROPERTIES="/etc/.java/deployment/deployment.properties"
 JAVA_DIR="/etc/.java/deployment"
 
-if [ ! -d ${JAVA_DIR} ] ; then
-  mkdir -p -m 755 ${JAVA_DIR}
-fi
+# shellcheck disable=SC2174
+mkdir -p -m 755 ${JAVA_DIR}
 
 if [ ! -e ${JAVA_PROPERTIES} ]; then
   touch ${JAVA_PROPERTIES} && chmod 644 ${JAVA_PROPERTIES}
diff --git a/products/jre/guide/java/java_jre_security_revocation_check_locked/bash/jre.sh b/products/jre/guide/java/java_jre_security_revocation_check_locked/bash/jre.sh
index 1c6a3536880..81f52cedec6 100644
--- a/products/jre/guide/java/java_jre_security_revocation_check_locked/bash/jre.sh
+++ b/products/jre/guide/java/java_jre_security_revocation_check_locked/bash/jre.sh
@@ -2,9 +2,8 @@
 JAVA_PROPERTIES="/etc/.java/deployment/deployment.properties"
 JAVA_DIR="/etc/.java/deployment"
 
-if [ ! -d ${JAVA_DIR} ] ; then
-  mkdir -p -m 755 ${JAVA_DIR}
-fi
+# shellcheck disable=SC2174
+mkdir -p -m 755 ${JAVA_DIR}
 
 if [ ! -e ${JAVA_PROPERTIES} ]; then
   touch ${JAVA_PROPERTIES} && chmod 644 ${JAVA_PROPERTIES}
diff --git a/products/jre/guide/java/java_jre_unsigned_applications/bash/jre.sh b/products/jre/guide/java/java_jre_unsigned_applications/bash/jre.sh
index 698fa7181dc..a9059e8cf08 100644
--- a/products/jre/guide/java/java_jre_unsigned_applications/bash/jre.sh
+++ b/products/jre/guide/java/java_jre_unsigned_applications/bash/jre.sh
@@ -2,9 +2,8 @@
 JAVA_PROPERTIES="/etc/.java/deployment/deployment.properties"
 JAVA_DIR="/etc/.java/deployment"
 
-if [ ! -d ${JAVA_DIR} ] ; then
-  mkdir -p -m 755 ${JAVA_DIR}
-fi
+# shellcheck disable=SC2174
+mkdir -p -m 755 ${JAVA_DIR}
 
 if [ ! -e ${JAVA_PROPERTIES} ]; then
   touch ${JAVA_PROPERTIES} && chmod 644 ${JAVA_PROPERTIES}
diff --git a/products/jre/guide/java/java_jre_unsigned_applications_locked/bash/jre.sh b/products/jre/guide/java/java_jre_unsigned_applications_locked/bash/jre.sh
index 617685c5ca4..7959c393e1e 100644
--- a/products/jre/guide/java/java_jre_unsigned_applications_locked/bash/jre.sh
+++ b/products/jre/guide/java/java_jre_unsigned_applications_locked/bash/jre.sh
@@ -2,9 +2,8 @@
 JAVA_PROPERTIES="/etc/.java/deployment/deployment.properties"
 JAVA_DIR="/etc/.java/deployment"
 
-if [ ! -d ${JAVA_DIR} ] ; then
-  mkdir -p -m 755 ${JAVA_DIR}
-fi
+# shellcheck disable=SC2174
+mkdir -p -m 755 ${JAVA_DIR}
 
 if [ ! -e ${JAVA_PROPERTIES} ]; then
   touch ${JAVA_PROPERTIES} && chmod 644 ${JAVA_PROPERTIES}
diff --git a/products/jre/guide/java/java_jre_validation_crl/bash/jre.sh b/products/jre/guide/java/java_jre_validation_crl/bash/jre.sh
index 3fbef8d2949..2fcc5440d7d 100644
--- a/products/jre/guide/java/java_jre_validation_crl/bash/jre.sh
+++ b/products/jre/guide/java/java_jre_validation_crl/bash/jre.sh
@@ -2,9 +2,8 @@
 JAVA_PROPERTIES="/etc/.java/deployment/deployment.properties"
 JAVA_DIR="/etc/.java/deployment"
 
-if [ ! -d ${JAVA_DIR} ] ; then
-  mkdir -p -m 755 ${JAVA_DIR}
-fi
+# shellcheck disable=SC2174
+mkdir -p -m 755 ${JAVA_DIR}
 
 if [ ! -e ${JAVA_PROPERTIES} ]; then
   touch ${JAVA_PROPERTIES} && chmod 644 ${JAVA_PROPERTIES}
diff --git a/products/jre/guide/java/java_jre_validation_crl_locked/bash/jre.sh b/products/jre/guide/java/java_jre_validation_crl_locked/bash/jre.sh
index 6ba74ae82e7..33a2f6c6f1b 100644
--- a/products/jre/guide/java/java_jre_validation_crl_locked/bash/jre.sh
+++ b/products/jre/guide/java/java_jre_validation_crl_locked/bash/jre.sh
@@ -2,9 +2,8 @@
 JAVA_PROPERTIES="/etc/.java/deployment/deployment.properties"
 JAVA_DIR="/etc/.java/deployment"
 
-if [ ! -d ${JAVA_DIR} ] ; then
-  mkdir -p -m 755 ${JAVA_DIR}
-fi
+# shellcheck disable=SC2174
+mkdir -p -m 755 ${JAVA_DIR}
 
 if [ ! -e ${JAVA_PROPERTIES} ]; then
   touch ${JAVA_PROPERTIES} && chmod 644 ${JAVA_PROPERTIES}
diff --git a/products/jre/guide/java/java_jre_validation_ocsp/bash/jre.sh b/products/jre/guide/java/java_jre_validation_ocsp/bash/jre.sh
index cc53b78bddb..30e1936514e 100644
--- a/products/jre/guide/java/java_jre_validation_ocsp/bash/jre.sh
+++ b/products/jre/guide/java/java_jre_validation_ocsp/bash/jre.sh
@@ -2,9 +2,8 @@
 JAVA_PROPERTIES="/etc/.java/deployment/deployment.properties"
 JAVA_DIR="/etc/.java/deployment"
 
-if [ ! -d ${JAVA_DIR} ] ; then
-  mkdir -p -m 755 ${JAVA_DIR}
-fi
+# shellcheck disable=SC2174
+mkdir -p -m 755 ${JAVA_DIR}
 
 if [ ! -e ${JAVA_PROPERTIES} ]; then
   touch ${JAVA_PROPERTIES} && chmod 644 ${JAVA_PROPERTIES}
diff --git a/products/jre/guide/java/java_jre_validation_ocsp_locked/bash/jre.sh b/products/jre/guide/java/java_jre_validation_ocsp_locked/bash/jre.sh
index a769421dec2..cb256fd72ee 100644
--- a/products/jre/guide/java/java_jre_validation_ocsp_locked/bash/jre.sh
+++ b/products/jre/guide/java/java_jre_validation_ocsp_locked/bash/jre.sh
@@ -2,9 +2,8 @@
 JAVA_PROPERTIES="/etc/.java/deployment/deployment.properties"
 JAVA_DIR="/etc/.java/deployment"
 
-if [ ! -d ${JAVA_DIR} ] ; then
-  mkdir -p -m 755 ${JAVA_DIR}
-fi
+# shellcheck disable=SC2174
+mkdir -p -m 755 ${JAVA_DIR}
 
 if [ ! -e ${JAVA_PROPERTIES} ]; then
   touch ${JAVA_PROPERTIES} && chmod 644 ${JAVA_PROPERTIES}

From b51abcb87da172abb9b635ff6770be1fdd214542 Mon Sep 17 00:00:00 2001
From: Markus Linnala <Markus.Linnala@knowit.fi>
Date: Wed, 16 Mar 2022 16:24:58 +0200
Subject: [PATCH 2/2] sap_host: solve shellcheck error SC2046

In build/ol7/fixes/bash/accounts_authorized_local_users_sidadm_orasid.sh line 22:
		if [ $(ls -ld "$path" | awk '{print $3}') = "oracle" ]; then
                     ^-- SC2046: Quote this to prevent word splitting.

For more information:
  https://www.shellcheck.net/wiki/SC2046 -- Quote this to prevent word splitt...
---
 .../bash/shared.sh                                              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linux_os/guide/system/software/sap_host/accounts_authorized_local_users_sidadm_orasid/bash/shared.sh b/linux_os/guide/system/software/sap_host/accounts_authorized_local_users_sidadm_orasid/bash/shared.sh
index 951ddb26c41..cdd88ac2621 100644
--- a/linux_os/guide/system/software/sap_host/accounts_authorized_local_users_sidadm_orasid/bash/shared.sh
+++ b/linux_os/guide/system/software/sap_host/accounts_authorized_local_users_sidadm_orasid/bash/shared.sh
@@ -18,7 +18,7 @@ function verify_oracle_user_to_userlist {
 	local path_list="$1"
 	local is_oracle=no
 	for path in $path_list ; do
-		if [ $(ls -ld "$path" | awk '{print $3}') = "oracle" ]; then
+		if [ "$(stat -c %U -- "$path")" = "oracle" ]; then
 			is_oracle=yes
 		fi
 	done