From 1bac756dcb31d2f2c584b7651b58577843e1e51e Mon Sep 17 00:00:00 2001
From: Charles Herlin <charles.herlin@corp.ovh.com>
Date: Tue, 12 Mar 2019 09:58:35 +0100
Subject: [PATCH] FIX(nbsp): remove non breakable spaces that caused Puppet to
 warn

---
 bin/hardening/13.5_find_0_uid_non_root_account.sh | 2 +-
 bin/hardening/7.7_enable_firewall.sh              | 2 +-
 bin/postinstall/tripwire.sh                       | 8 ++++----
 lib/main.sh                                       | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/bin/hardening/13.5_find_0_uid_non_root_account.sh b/bin/hardening/13.5_find_0_uid_non_root_account.sh
index 8043bd3..130c70b 100755
--- a/bin/hardening/13.5_find_0_uid_non_root_account.sh
+++ b/bin/hardening/13.5_find_0_uid_non_root_account.sh
@@ -53,7 +53,7 @@ apply () {
 create_config() {
     cat <<EOF
 status=audit
-# Put here valid accounts with uid 0 separated by spaces
+# Put here valid accounts with uid 0 separated by spaces
 EXCEPTIONS=""
 EOF
 }
diff --git a/bin/hardening/7.7_enable_firewall.sh b/bin/hardening/7.7_enable_firewall.sh
index 5ddc50a..0c8d74b 100755
--- a/bin/hardening/7.7_enable_firewall.sh
+++ b/bin/hardening/7.7_enable_firewall.sh
@@ -14,7 +14,7 @@ set -u # One variable unset, it's over
 HARDENING_LEVEL=2
 DESCRIPTION="Ensure firewall is active (iptables is installed, does not check for its configuration)."
 
-# Quick note here : CIS recommends your iptables rules to be persistent. 
+# Quick note here : CIS recommends your iptables rules to be persistent. 
 # Do as you want, but this script does not handle this
 
 PACKAGE='iptables'
diff --git a/bin/postinstall/tripwire.sh b/bin/postinstall/tripwire.sh
index 3e8703e..5b83424 100755
--- a/bin/postinstall/tripwire.sh
+++ b/bin/postinstall/tripwire.sh
@@ -5,15 +5,15 @@
 #
 
 # If you followed this CIS hardening, this script follows 8.3.1_install_tripwire.sh
-# After installing tripwire, you may want to run those few commented commands to make it fully functionnal
+# After installing tripwire, you may want to run those few commented commands to make it fully functionnal
 
 echo "Generating Site key file..."
 twadmin -m G -S /etc/tripwire/site.key # Generates Site key file
 echo "Generating Local key file..."
-twadmin -m G -S /etc/tripwire/$(hostname -f)-local.key # Generate local key file
+twadmin -m G -S /etc/tripwire/$(hostname -f)-local.key # Generate local key file
 echo "Generating encrypted policy..."
 twadmin -m P /etc/tripwire/twpol.txt # Apply new policy with generated site key file
 echo "Generating Local database with newly created key..."
-/usr/sbin/twadmin --create-cfgfile -S /etc/tripwire/site.key /etc/tripwire/twcfg.txt # Init database with generated local key file
+/usr/sbin/twadmin --create-cfgfile -S /etc/tripwire/site.key /etc/tripwire/twcfg.txt # Init database with generated local key file
 echo "Testing tripwire database update"
-tripwire -m i # Test configuration update
+tripwire -m i # Test configuration update
diff --git a/lib/main.sh b/lib/main.sh
index 197f634..41653ab 100644
--- a/lib/main.sh
+++ b/lib/main.sh
@@ -1,7 +1,7 @@
 LONG_SCRIPT_NAME=$(basename $0)
 SCRIPT_NAME=${LONG_SCRIPT_NAME%.sh}
 # Variable initialization, to avoid crash
-CRITICAL_ERRORS_NUMBER=0 # This will be used to see if a script failed, or passed
+CRITICAL_ERRORS_NUMBER=0 # This will be used to see if a script failed, or passed
 BATCH_MODE=0
 BATCH_OUTPUT=""
 status=""
@@ -103,7 +103,7 @@ case $status in
         ;;
     disabled | false )
         info "$SCRIPT_NAME is disabled, ignoring"
-        exit 2 # Means unknown status
+        exit 2 # Means unknown status
         ;;
     *)
         warn "Wrong value for status : $status. Must be [ enabled | true | audit | disabled | false ]"
@@ -117,7 +117,7 @@ if [ $CRITICAL_ERRORS_NUMBER -eq 0 ]; then
     else
         ok "Check Passed"
     fi
-    exit 0 # Means ok status
+    exit 0 # Means ok status
 else
     if [ $BATCH_MODE -eq 1 ]; then
         BATCH_OUTPUT="KO $SCRIPT_NAME $BATCH_OUTPUT"