Merge pull request #28 in IAAS/cis-hardening from dev/cherlin/cis-root-dir-in-env to master

* commit '5b11b1628a690e0bbd9d34cd5b83dbe74ac6fba7':
  Expand tabs to 4 spaces and trim trailing spaces
  Remove unnecessary CIS_ROOT_DIR empty assignation
  Applying batch edit to all hardening/*.sh scripts for new CIS_ROOT_DIR management
  Changing CIS_ROOT_DIR management in env in bin/hardening.sh
  Change src/skel to allow setting CIS_ROOT_DIR in env and not just sourcing /etc/default/cis-hardening. Making the whole lib more versatile.

bin/hardening.sh

@@ -22,7 +22,6 @@ AUDIT_ALL=0
 AUDIT_ALL_ENABLE_PASSED=0
 ALLOW_SERVICE_LIST=0
 SET_HARDENING_LEVEL=0
-CIS_ROOT_DIR=''
 
 usage() {
     cat << EOF
@@ -136,15 +135,13 @@ while [[ $# > 0 ]]; do
 done
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 [ -r $CIS_ROOT_DIR/lib/constants.sh  ] && . $CIS_ROOT_DIR/lib/constants.sh

bin/hardening/1.1_install_updates.sh

@@ -45,15 +45,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/10.1.1_set_password_exp_days.sh

@@ -73,15 +73,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/10.1.2_set_password_min_days_change.sh

@@ -73,15 +73,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/10.1.3_set_password_exp_warning_days.sh

@@ -73,15 +73,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/10.2_disable_system_accounts.sh

@@ -89,15 +89,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/10.3_default_root_group.sh

@@ -41,15 +41,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/10.4_default_umask.sh

@@ -91,15 +91,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/10.5_lock_inactive_user_account.sh

@@ -33,15 +33,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/11.1_warning_banners.sh

@@ -67,15 +67,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/11.2_remove_os_info_warning_banners.sh

@@ -47,15 +47,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/11.3_graphical_warning_banners.sh

@@ -29,15 +29,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/12.10_find_suid_files.sh

@@ -53,15 +53,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/12.11_find_sgid_files.sh

@@ -54,15 +54,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/12.1_etc_passwd_permissions.sh

@@ -43,15 +43,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/12.2_etc_shadow_permissions.sh

@@ -43,15 +43,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/12.3_etc_group_permissions.sh

@@ -43,15 +43,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/12.4_etc_passwd_ownership.sh

@@ -58,15 +58,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/12.5_etc_shadow_ownership.sh

@@ -58,15 +58,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/12.6_etc_group_ownership.sh

@@ -58,15 +58,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/12.7_find_world_writable_file.sh

@@ -44,15 +44,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/12.8_find_unowned_files.sh

@@ -46,15 +46,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/12.9_find_ungrouped_files.sh

@@ -46,15 +46,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/13.10_find_user_rhosts_files.sh

@@ -44,15 +44,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening FILE, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/13.11_find_passwd_group_inconsistencies.sh

@@ -42,15 +42,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening FILE, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/13.12_users_valid_homedir.sh

@@ -45,15 +45,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening FILE, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/13.13_check_user_homedir_ownership.sh

@@ -56,15 +56,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening FILE, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/13.14_check_duplicate_uid.sh

@@ -45,15 +45,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening FILE, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/13.15_check_duplicate_gid.sh

@@ -45,15 +45,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening FILE, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/13.16_check_duplicate_username.sh

@@ -45,15 +45,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening FILE, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/13.17_check_duplicate_groupname.sh

@@ -45,15 +45,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening FILE, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/13.18_find_user_netrc_files.sh

@@ -44,15 +44,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening FILE, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/13.19_find_user_forward_files.sh

@@ -44,15 +44,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening FILE, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/13.1_remove_empty_password_field.sh

@@ -47,15 +47,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/13.20_shadow_group_empty.sh

@@ -54,15 +54,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening FILE, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/13.2_remove_legacy_passwd_entries.sh

@@ -48,15 +48,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/13.3_remove_legacy_shadow_entries.sh

@@ -48,15 +48,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/13.4_remove_legacy_group_entries.sh

@@ -48,15 +48,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/13.5_find_0_uid_non_root_account.sh

@@ -61,15 +61,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/13.6_sanitize_root_path.sh

@@ -71,15 +71,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/13.7_check_user_dir_perm.sh

@@ -105,15 +105,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/13.8_check_user_dot_file_perm.sh

@@ -64,15 +64,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening FILE, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/13.9_set_perm_on_user_netrc.sh

@@ -63,15 +63,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening FILE, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/2.10_home_nodev.sh

@@ -68,15 +68,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/2.11_removable_device_nodev.sh

@@ -56,15 +56,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/2.12_removable_device_noexec.sh

@@ -56,15 +56,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/2.13_removable_device_nosuid.sh

@@ -56,15 +56,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/2.14_run_shm_nodev.sh

@@ -68,15 +68,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/2.15_run_shm_nosuid.sh

@@ -68,15 +68,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/2.16_run_shm_noexec.sh

@@ -68,15 +68,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/2.17_sticky_bit_world_writable_folder.sh

@@ -43,15 +43,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/2.18_disable_cramfs.sh

@@ -45,15 +45,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/2.19_disable_freevxfs.sh

@@ -45,15 +45,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/2.1_tmp_partition.sh

@@ -57,15 +57,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/2.20_disable_jffs2.sh

@@ -45,15 +45,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/2.21_disable_hfs.sh

@@ -45,15 +45,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/2.22_disable_hfsplus.sh

@@ -45,15 +45,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/2.23_disable_squashfs.sh

@@ -45,15 +45,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/2.24_disable_udf.sh

@@ -45,15 +45,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/2.25_disable_automounting.sh

@@ -44,15 +44,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/2.2_tmp_nodev.sh

@@ -68,15 +68,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/2.3_tmp_nosuid.sh

@@ -68,15 +68,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/2.4_tmp_noexec.sh

@@ -68,15 +68,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/2.5_var_partition.sh

@@ -57,15 +57,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/2.6.1_var_tmp_partition.sh

@@ -57,15 +57,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/2.6.2_var_tmp_nodev.sh

@@ -68,15 +68,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/2.6.3_var_tmp_nosuid.sh

@@ -68,15 +68,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/2.6.4_var_tmp_noexec.sh

@@ -68,15 +68,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/2.7_var_log_partition.sh

@@ -57,15 +57,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/2.8_var_log_audit_partition.sh

@@ -57,15 +57,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/2.9_home_partition.sh

@@ -57,15 +57,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/3.1_bootloader_ownership.sh

@@ -66,15 +66,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/3.2_bootloader_permissions.sh

@@ -53,15 +53,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/3.3_bootloader_password.sh

@@ -64,15 +64,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/3.4_root_password.sh

@@ -43,15 +43,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/4.1_restrict_core_dumps.sh

@@ -63,15 +63,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/4.2_enable_nx_support.sh

@@ -65,15 +65,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/4.3_enable_randomized_vm_placement.sh

@@ -47,15 +47,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/4.4_disable_prelink.sh

@@ -46,15 +46,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/4.5_enable_apparmor.sh

@@ -43,15 +43,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/5.1.1_disable_nis.sh

@@ -44,15 +44,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/5.1.2_disable_rsh.sh

@@ -76,15 +76,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/5.1.3_disable_rsh_client.sh

@@ -48,15 +48,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/5.1.4_disable_talk.sh

@@ -75,15 +75,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/5.1.5_disable_talk_client.sh

@@ -47,15 +47,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/5.1.6_disable_telnet_server.sh

@@ -76,15 +76,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/5.1.7_disable_tftp_server.sh

@@ -75,15 +75,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/5.1.8_disable_inetd.sh

@@ -47,15 +47,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/5.2_disable_chargen.sh

@@ -56,15 +56,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/5.3_disable_daytime.sh

@@ -56,15 +56,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/5.4_disable_echo.sh

@@ -56,15 +56,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/5.5_disable_discard.sh

@@ -56,15 +56,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/5.6_disable_time.sh

@@ -56,15 +56,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/6.10_disable_http_server.sh

@@ -49,15 +49,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/6.11_disable_imap_pop.sh

@@ -49,15 +49,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/6.12_disable_samba.sh

@@ -48,15 +48,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/6.13_disable_http_proxy.sh

@@ -48,15 +48,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/6.14_disable_snmp_server.sh

@@ -48,15 +48,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/6.15_mta_localhost.sh

@@ -57,15 +57,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)

bin/hardening/6.16_disable_rsync.sh

@@ -59,15 +59,13 @@ check_config() {
 }
 
 # Source Root Dir Parameter
-if [ ! -r /etc/default/cis-hardening ]; then
-    echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
-    exit 128
-else
+if [ -r /etc/default/cis-hardening ]; then
     . /etc/default/cis-hardening
-    if [ -z ${CIS_ROOT_DIR:-} ]; then
-        echo "No CIS_ROOT_DIR variable, aborting"
+fi
+if [ -z "$CIS_ROOT_DIR" ]; then
+     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
+     echo "Cannot source CIS_ROOT_DIR variable, aborting."
     exit 128
-    fi
 fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)