Skip to content

Commit

Permalink
Merge pull request #9398 from maage/test-shellcheck-1
Browse files Browse the repository at this point in the history 
Fix 2 ctest shellcheck issues
  • Loading branch information
@marcusburghardt
marcusburghardt committed Aug 25, 2022
2 parents 42c14d4 + b51abcb commit 2c90028
Show file tree
Hide file tree
Showing 25 changed files with 50 additions and 74 deletions.
2 changes: 1 addition & 1 deletion ...ide/system/software/sap_host/accounts_authorized_local_users_sidadm_orasid/bash/shared.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions .../guide/java/java_jre_accepted_sites_configured/java_jre_accepted_sites_exists/bash/jre.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
5 changes: 2 additions & 3 deletions ...de/java/java_jre_accepted_sites_configured/java_jre_accepted_sites_properties/bash/jre.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
5 changes: 2 additions & 3 deletions products/jre/guide/java/java_jre_blacklist_check/bash/jre.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
5 changes: 2 additions & 3 deletions products/jre/guide/java/java_jre_blacklist_check_locked/bash/jre.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
7 changes: 3 additions & 4 deletions .../java/java_jre_deployment_config_configured/java_jre_deployment_config_exists/bash/jre.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}
chmod 644 ${JAVA_CONFIG}
5 changes: 2 additions & 3 deletions ...va/java_jre_deployment_config_configured/java_jre_deployment_config_mandatory/bash/jre.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
5 changes: 2 additions & 3 deletions ...a/java_jre_deployment_config_configured/java_jre_deployment_config_properties/bash/jre.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
5 changes: 2 additions & 3 deletions products/jre/guide/java/java_jre_deployment_properties_exists/bash/jre.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
5 changes: 2 additions & 3 deletions products/jre/guide/java/java_jre_disable_untrusted_sources/bash/jre.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
5 changes: 2 additions & 3 deletions products/jre/guide/java/java_jre_disable_untrusted_sources_locked/bash/jre.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
5 changes: 2 additions & 3 deletions products/jre/guide/java/java_jre_enable_jws/bash/jre.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
5 changes: 2 additions & 3 deletions products/jre/guide/java/java_jre_enable_jws_locked/bash/jre.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
5 changes: 2 additions & 3 deletions products/jre/guide/java/java_jre_insecure_prompt/bash/jre.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
5 changes: 2 additions & 3 deletions products/jre/guide/java/java_jre_insecure_prompt_locked/bash/jre.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
5 changes: 2 additions & 3 deletions products/jre/guide/java/java_jre_lock_untrusted_sources/bash/jre.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
5 changes: 2 additions & 3 deletions products/jre/guide/java/java_jre_lock_untrusted_sources_locked/bash/jre.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
5 changes: 2 additions & 3 deletions products/jre/guide/java/java_jre_security_revocation_check/bash/jre.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
5 changes: 2 additions & 3 deletions products/jre/guide/java/java_jre_security_revocation_check_locked/bash/jre.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
5 changes: 2 additions & 3 deletions products/jre/guide/java/java_jre_unsigned_applications/bash/jre.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
5 changes: 2 additions & 3 deletions products/jre/guide/java/java_jre_unsigned_applications_locked/bash/jre.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
5 changes: 2 additions & 3 deletions products/jre/guide/java/java_jre_validation_crl/bash/jre.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
5 changes: 2 additions & 3 deletions products/jre/guide/java/java_jre_validation_crl_locked/bash/jre.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
5 changes: 2 additions & 3 deletions products/jre/guide/java/java_jre_validation_ocsp/bash/jre.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
5 changes: 2 additions & 3 deletions products/jre/guide/java/java_jre_validation_ocsp_locked/bash/jre.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down

0 comments on commit 2c90028

Please sign in to comment.