Fixed default file error handling and quickstart

README.md

@@ -27,6 +27,7 @@ hardening [INFO] Treating /opt/cis-hardening/bin/hardening/13.15_check_duplicate
 ```console
 $ git clone https://github.com/ovh/debian-cis.git && cd debian-cis
 $ cp debian/default /etc/default/cis-hardening
+$ sed -i "s#CIS_ROOT_DIR=.*#CIS_ROOT_DIR='$(pwd)'#" /etc/default/cis-hardening
 $ bin/hardening/1.1_install_updates.sh --audit-all
 1.1_install_updates [INFO] Working on 1.1_install_updates
 1.1_install_updates [INFO] Checking Configuration

bin/hardening/1.1_install_updates.sh

@@ -48,11 +48,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/10.1.1_set_password_exp_days.sh

@@ -76,11 +76,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/10.1.2_set_password_min_days_change.sh

@@ -76,11 +76,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/10.1.3_set_password_exp_warning_days.sh

@@ -76,11 +76,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/10.2_disable_system_accounts.sh

@@ -81,11 +81,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/10.3_default_root_group.sh

@@ -44,11 +44,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/10.4_default_umask.sh

@@ -50,11 +50,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/10.5_lock_inactive_user_account.sh

@@ -36,11 +36,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/11.1_warning_banners.sh

@@ -70,11 +70,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/11.2_remove_os_info_warning_banners.sh

@@ -50,11 +50,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/11.3_graphical_warning_banners.sh

@@ -32,11 +32,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/12.10_find_suid_files.sh

@@ -47,11 +47,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/12.11_find_sgid_files.sh

@@ -48,11 +48,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/12.1_etc_passwd_permissions.sh

@@ -46,11 +46,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/12.2_etc_shadow_permissions.sh

@@ -46,11 +46,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/12.3_etc_group_permissions.sh

@@ -46,11 +46,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/12.4_etc_passwd_ownership.sh

@@ -61,11 +61,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/12.5_etc_shadow_ownership.sh

@@ -61,11 +61,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/12.6_etc_group_ownership.sh

@@ -61,11 +61,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/12.7_find_world_writable_file.sh

@@ -47,11 +47,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/12.8_find_unowned_files.sh

@@ -49,11 +49,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/12.9_find_ungrouped_files.sh

@@ -49,11 +49,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/13.10_find_user_rhosts_files.sh

@@ -47,11 +47,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/13.11_find_passwd_group_inconsistencies.sh

@@ -45,11 +45,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/13.12_users_valid_homedir.sh

@@ -48,11 +48,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/13.13_check_user_homedir_ownership.sh

@@ -59,11 +59,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/13.14_check_duplicate_uid.sh

@@ -48,11 +48,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/13.15_check_duplicate_gid.sh

@@ -48,11 +48,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/13.16_check_duplicate_username.sh

@@ -48,11 +48,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/13.17_check_duplicate_groupname.sh

@@ -48,11 +48,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/13.18_find_user_netrc_files.sh

@@ -47,11 +47,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/13.19_find_user_forward_files.sh

@@ -47,11 +47,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/13.1_remove_empty_password_field.sh

@@ -50,11 +50,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/13.20_shadow_group_empty.sh

@@ -57,11 +57,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/13.2_remove_legacy_passwd_entries.sh

@@ -51,11 +51,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/13.3_remove_legacy_shadow_entries.sh

@@ -51,11 +51,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/13.4_remove_legacy_group_entries.sh

@@ -51,11 +51,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/13.5_find_0_uid_non_root_account.sh

@@ -55,11 +55,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/13.6_sanitize_root_path.sh

@@ -74,11 +74,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/13.7_check_user_dir_perm.sh

@@ -99,11 +99,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/13.8_check_user_dot_file_perm.sh

@@ -67,11 +67,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/13.9_set_perm_on_user_netrc.sh

@@ -66,11 +66,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/2.10_home_nodev.sh

@@ -71,11 +71,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/2.11_removable_device_nodev.sh

@@ -59,11 +59,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/2.12_removable_device_noexec.sh

@@ -59,11 +59,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/2.13_removable_device_nosuid.sh

@@ -59,11 +59,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/2.14_run_shm_nodev.sh

@@ -71,11 +71,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/2.15_run_shm_nosuid.sh

@@ -71,11 +71,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/2.16_run_shm_noexec.sh

@@ -71,11 +71,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/2.17_sticky_bit_world_writable_folder.sh

@@ -46,11 +46,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/2.18_disable_cramfs.sh

@@ -48,11 +48,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/2.19_disable_freevxfs.sh

@@ -48,11 +48,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/2.1_tmp_partition.sh

@@ -60,11 +60,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/2.20_disable_jffs2.sh

@@ -48,11 +48,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/2.21_disable_hfs.sh

@@ -48,11 +48,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/2.22_disable_hfsplus.sh

@@ -48,11 +48,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/2.23_disable_squashfs.sh

@@ -48,11 +48,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/2.24_disable_udf.sh

@@ -48,11 +48,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/2.25_disable_automounting.sh

@@ -47,11 +47,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/2.2_tmp_nodev.sh

@@ -71,11 +71,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/2.3_tmp_nosuid.sh

@@ -71,11 +71,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/2.4_tmp_noexec.sh

@@ -71,11 +71,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/2.5_var_partition.sh

@@ -60,11 +60,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/2.6.1_var_tmp_partition.sh

@@ -60,11 +60,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/2.6.2_var_tmp_nodev.sh

@@ -71,11 +71,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/2.6.3_var_tmp_nosuid.sh

@@ -71,11 +71,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/2.6.4_var_tmp_noexec.sh

@@ -71,11 +71,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/2.7_var_log_partition.sh

@@ -60,11 +60,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/2.8_var_log_audit_partition.sh

@@ -60,11 +60,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/2.9_home_partition.sh

@@ -60,11 +60,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/3.1_bootloader_ownership.sh

@@ -69,11 +69,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/3.2_bootloader_permissions.sh

@@ -56,11 +56,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/3.3_bootloader_password.sh

@@ -67,11 +67,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/3.4_root_password.sh

@@ -46,11 +46,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/4.1_restrict_core_dumps.sh

@@ -66,11 +66,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/4.2_enable_nx_support.sh

@@ -44,11 +44,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/4.3_enable_randomized_vm_placement.sh

@@ -50,11 +50,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/4.4_disable_prelink.sh

@@ -49,11 +49,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/4.5_enable_apparmor.sh

@@ -46,11 +46,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/5.1.1_disable_nis.sh

@@ -47,11 +47,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/5.1.2_disable_rsh.sh

@@ -79,11 +79,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/5.1.3_disable_rsh_client.sh

@@ -51,11 +51,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/5.1.4_disable_talk.sh

@@ -78,11 +78,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/5.1.5_disable_talk_client.sh

@@ -50,11 +50,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/5.1.6_disable_telnet_server.sh

@@ -79,11 +79,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/5.1.7_disable_tftp_server.sh

@@ -79,11 +79,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/5.1.8_disable_inetd.sh

@@ -50,11 +50,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/5.2_disable_chargen.sh

@@ -59,11 +59,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/5.3_disable_daytime.sh

@@ -59,11 +59,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/5.4_disable_echo.sh

@@ -59,11 +59,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/5.5_disable_discard.sh

@@ -59,11 +59,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/5.6_disable_time.sh

@@ -59,11 +59,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/6.10_disable_http_server.sh

@@ -51,11 +51,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/6.11_disable_imap_pop.sh

@@ -51,11 +51,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/6.12_disable_samba.sh

@@ -50,11 +50,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/6.13_disable_http_proxy.sh

@@ -50,11 +50,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/6.14_disable_snmp_server.sh

@@ -50,11 +50,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/6.15_mta_localhost.sh

@@ -57,11 +57,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi

bin/hardening/6.16_disable_rsync.sh

@@ -61,11 +61,16 @@ if [ ! -r /etc/default/cis-hardening ]; then
     exit 128
 else
     . /etc/default/cis-hardening
-    if [ -z $CIS_ROOT_DIR ]; then
+    if [ -z ${CIS_ROOT_DIR:-} ]; then
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
 fi 
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
+if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
+    . $CIS_ROOT_DIR/lib/main.sh
+else
+    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
+    exit 128
+fi