Code improvements, use awk for exact match

This commit is contained in:
Jose
2020-02-05 07:00:11 -04:00
parent 9a1b673721
commit 498029a13c
12 changed files with 12 additions and 12 deletions

View File

@@ -53,7 +53,7 @@ if [ "${TARGET}" = 'ALL' ]; then
JAILS=$(jls name) JAILS=$(jls name)
fi fi
if [ "${TARGET}" != 'ALL' ]; then if [ "${TARGET}" != 'ALL' ]; then
JAILS=$(jls name | grep -w "${TARGET}") JAILS=$(jls name | awk "/^${TARGET}$/")
fi fi
for _jail in ${JAILS}; do for _jail in ${JAILS}; do

View File

@@ -54,7 +54,7 @@ if [ "${TARGET}" = 'ALL' ]; then
JAILS=$(jls name) JAILS=$(jls name)
fi fi
if [ "${TARGET}" != 'ALL' ]; then if [ "${TARGET}" != 'ALL' ]; then
JAILS=$(jls name | grep -w "${TARGET}") JAILS=$(jls name | awk "/^${TARGET}$/")
fi fi
validate_user() { validate_user() {

View File

@@ -55,7 +55,7 @@ if [ "${TARGET}" = 'ALL' ]; then
JAILS=$(jls name) JAILS=$(jls name)
fi fi
if [ "${TARGET}" != 'ALL' ]; then if [ "${TARGET}" != 'ALL' ]; then
JAILS=$(jls name | grep -w "${TARGET}") JAILS=$(jls name | awk "/^${TARGET}$/")
fi fi
for _jail in ${JAILS}; do for _jail in ${JAILS}; do

View File

@@ -54,7 +54,7 @@ if [ "${TARGET}" = 'ALL' ]; then
JAILS=$(jls name) JAILS=$(jls name)
fi fi
if [ "${TARGET}" != 'ALL' ]; then if [ "${TARGET}" != 'ALL' ]; then
JAILS=$(jls name | grep -w "${TARGET}") JAILS=$(jls name | awk "/^${TARGET}$/")
fi fi
for _jail in ${JAILS}; do for _jail in ${JAILS}; do

View File

@@ -63,7 +63,7 @@ if [ "${TARGET}" = 'ALL' ]; then
fi fi
if [ "${TARGET}" != 'ALL' ]; then if [ "${TARGET}" != 'ALL' ]; then
JAILS=$(jls name | grep -w "${TARGET}") JAILS=$(jls name | awk "/^${TARGET}$/")
fi fi
for _jail in ${JAILS}; do for _jail in ${JAILS}; do

View File

@@ -53,7 +53,7 @@ if [ "${TARGET}" = 'ALL' ]; then
JAILS=$(jls name) JAILS=$(jls name)
fi fi
if [ "${TARGET}" != 'ALL' ]; then if [ "${TARGET}" != 'ALL' ]; then
JAILS=$(jls name | grep -w "${TARGET}") JAILS=$(jls name | awk "/^${TARGET}$/")
fi fi
for _jail in ${JAILS}; do for _jail in ${JAILS}; do

View File

@@ -54,7 +54,7 @@ if [ "${TARGET}" = 'ALL' ]; then
fi fi
if [ "${TARGET}" != 'ALL' ]; then if [ "${TARGET}" != 'ALL' ]; then
JAILS=$(jls name | grep -w "${TARGET}") JAILS=$(jls name | awk "/^${TARGET}$/")
fi fi
for _jail in ${JAILS}; do for _jail in ${JAILS}; do

View File

@@ -54,7 +54,7 @@ if [ "${TARGET}" = 'ALL' ]; then
fi fi
if [ "${TARGET}" != 'ALL' ]; then if [ "${TARGET}" != 'ALL' ]; then
JAILS=$(jls name | grep -w "${TARGET}") JAILS=$(jls name | awk "/^${TARGET}$/")
fi fi
for _jail in ${JAILS}; do for _jail in ${JAILS}; do

View File

@@ -54,7 +54,7 @@ if [ "${TARGET}" = 'ALL' ]; then
JAILS=$(jls name) JAILS=$(jls name)
fi fi
if [ "${TARGET}" != 'ALL' ]; then if [ "${TARGET}" != 'ALL' ]; then
JAILS=$(jls name | grep -w "${TARGET}") JAILS=$(jls name | awk "/^${TARGET}$/")
fi fi
TEMPLATE="${1}" TEMPLATE="${1}"

View File

@@ -54,7 +54,7 @@ if [ "${TARGET}" = 'ALL' ]; then
fi fi
if [ "${TARGET}" != 'ALL' ]; then if [ "${TARGET}" != 'ALL' ]; then
JAILS=$(jls name | grep -w "${TARGET}") JAILS=$(jls name | awk "/^${TARGET}$/")
fi fi
for _jail in ${JAILS}; do for _jail in ${JAILS}; do

View File

@@ -57,7 +57,7 @@ fi
if [ -d "${bastille_jailsdir}/${TARGET}" ]; then if [ -d "${bastille_jailsdir}/${TARGET}" ]; then
if ! grep -qw ".bastille" "${bastille_jailsdir}/${TARGET}/fstab"; then if ! grep -qw ".bastille" "${bastille_jailsdir}/${TARGET}/fstab"; then
if [ "$(jls name | grep -w "${TARGET}")" ]; then if [ "$(jls name | awk "/^${TARGET}$/")" ]; then
# Update a thick container. # Update a thick container.
CURRENT_VERSION=$(/usr/sbin/jexec -l ${TARGET} freebsd-version 2>/dev/null) CURRENT_VERSION=$(/usr/sbin/jexec -l ${TARGET} freebsd-version 2>/dev/null)
if [ -z "${CURRENT_VERSION}" ]; then if [ -z "${CURRENT_VERSION}" ]; then

View File

@@ -98,7 +98,7 @@ if [ "${TARGET}" = 'ALL' ]; then
fi fi
if [ "${TARGET}" != 'ALL' ]; then if [ "${TARGET}" != 'ALL' ]; then
JAILS=$(jls name | grep -w "${TARGET}") JAILS=$(jls name | awk "/^${TARGET}$/")
fi fi
case "$2" in case "$2" in