Merge pull request #269 from mattaudesse/normalize-template-sh-indentation
Normalize indentation in usr/local/share/bastille/template.sh
This commit is contained in:
@@ -163,8 +163,8 @@ for _jail in ${JAILS}; do
|
|||||||
|
|
||||||
for _hook in ${HOOKS}; do
|
for _hook in ${HOOKS}; do
|
||||||
if [ -s "${bastille_template}/${_hook}" ]; then
|
if [ -s "${bastille_template}/${_hook}" ]; then
|
||||||
# Default command is the lowercase hook name and default args are the line from the file. -- cwells
|
# Default command is the lowercase hook name and default args are the line from the file. -- cwells
|
||||||
_cmd=$(echo "${_hook}" | awk '{print tolower($1);}')
|
_cmd=$(echo "${_hook}" | awk '{print tolower($1);}')
|
||||||
_args_template='${_line}'
|
_args_template='${_line}'
|
||||||
|
|
||||||
# Override default command/args for some hooks. -- cwells
|
# Override default command/args for some hooks. -- cwells
|
||||||
@@ -195,9 +195,9 @@ for _jail in ${JAILS}; do
|
|||||||
bastille pkg "${_jail}" audit -F
|
bastille pkg "${_jail}" audit -F
|
||||||
else
|
else
|
||||||
while read _line; do
|
while read _line; do
|
||||||
if [ -z "${_line}" ]; then
|
if [ -z "${_line}" ]; then
|
||||||
continue
|
continue
|
||||||
fi
|
fi
|
||||||
eval "_args=\"${_args_template}\""
|
eval "_args=\"${_args_template}\""
|
||||||
bastille "${_cmd}" "${_jail}" ${_args} || exit 1
|
bastille "${_cmd}" "${_jail}" ${_args} || exit 1
|
||||||
done < "${bastille_template}/${_hook}"
|
done < "${bastille_template}/${_hook}"
|
||||||
|
|||||||
Reference in New Issue
Block a user