BastilleBSD/bastille
2
0
Fork 0
Code Pull Requests Actions Packages Releases Activity

Merge pull request #293 from chriswells0/grep-fixes

Browse Source 
Fix grep when UTF-8 is not used.
This commit is contained in:
Christer Edwards
2020-12-13 09:10:36 -07:00
committed by GitHub
parent be6b1adfb9 7675286cd3
commit 31dfa2bfba
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
usr/local/share/bastille/config.sh
View File

@@ -72,7 +72,7 @@ for _jail in ${JAILS}; do
fi fi
ESCAPED_PROPERTY=$(echo "${PROPERTY}" | sed 's/\./\\\./g') ESCAPED_PROPERTY=$(echo "${PROPERTY}" | sed 's/\./\\\./g')
MATCH_LINE=$(grep "^ *${ESCAPED_PROPERTY}[ =;]" "${FILE}" 2>/dev/null) MATCH_LINE=$(grep "^[[:blank:]]*${ESCAPED_PROPERTY}[[:blank:]=;]" "${FILE}" 2>/dev/null)
MATCH_FOUND=$? MATCH_FOUND=$?
if [ "${ACTION}" = 'get' ]; then if [ "${ACTION}" = 'get' ]; then

2
usr/local/share/bastille/template.sh
View File

@@ -266,7 +266,7 @@ for _jail in ${JAILS}; do
if [ -s "${bastille_template}/Bastillefile" ]; then if [ -s "${bastille_template}/Bastillefile" ]; then
# Ignore blank lines and comments. -- cwells # Ignore blank lines and comments. -- cwells
SCRIPT=$(grep -v '^\s*$' "${bastille_template}/Bastillefile" | grep -v '^\s*#') SCRIPT=$(grep -v '^[[:blank:]]*$' "${bastille_template}/Bastillefile" | grep -v '^[[:blank:]]*#')
# Use a newline as the separator. -- cwells # Use a newline as the separator. -- cwells
IFS=' IFS='
' '