diff --git a/usr/local/share/bastille/cmd.sh b/usr/local/share/bastille/cmd.sh index 4dc06487..cc6eb4ba 100644 --- a/usr/local/share/bastille/cmd.sh +++ b/usr/local/share/bastille/cmd.sh @@ -98,9 +98,6 @@ for _jail in ${JAILS}; do error_continue "Use [-a|--auto] to auto-start the jail." fi - # Print blank line in front of first jail - [ "${_jail}" = "${_FIRST_JAIL}" ] && echo "" - info "[${_jail}]:" COUNT=$(($COUNT+1)) diff --git a/usr/local/share/bastille/common.sh b/usr/local/share/bastille/common.sh index 1b246da6..8268ca82 100644 --- a/usr/local/share/bastille/common.sh +++ b/usr/local/share/bastille/common.sh @@ -67,7 +67,6 @@ fi # Notify message on error, and continue to next jail error_continue() { error_notify "$@" - echo "" # shellcheck disable=SC2104 continue } @@ -209,10 +208,8 @@ set_target() { TARGET="$(list_jail_priority "${TARGET}" | sort -k2 -nr | awk '{print $1}')" JAILS="$(list_jail_priority "${TARGET}" | sort -k2 -nr | awk '{print $1}')" fi - _FIRST_JAIL="$(echo ${JAILS} | awk '{print $1}')" export TARGET export JAILS - export _FIRST_JAIL fi } @@ -239,10 +236,8 @@ set_target_single() { fi TARGET="${_TARGET}" JAILS="${_TARGET}" - _FIRST_JAIL="$(echo ${JAILS} | awk '{print $1}')" export TARGET export JAILS - export _FIRST_JAIL } target_all_jails() { @@ -258,9 +253,7 @@ target_all_jails() { elif [ "${_order}" = "reverse" ]; then JAILS="$(list_jail_priority "${JAILS}" | sort -k2 -nr | awk '{print $1}')" fi - _FIRST_JAIL="$(echo ${JAILS} | awk '{print $1}')" export JAILS - export _FIRST_JAIL } update_fstab() { diff --git a/usr/local/share/bastille/console.sh b/usr/local/share/bastille/console.sh index e51a16fa..92f6e3c0 100644 --- a/usr/local/share/bastille/console.sh +++ b/usr/local/share/bastille/console.sh @@ -123,9 +123,6 @@ for _jail in ${JAILS}; do error_continue "Use [-a|--auto] to auto-start the jail." fi - # Print blank line in front of first jail - [ "${_jail}" = "${_FIRST_JAIL}" ] && echo "" - info "[${_jail}]:" LOGIN="$(jexec -l "${_jail}" which login)" diff --git a/usr/local/share/bastille/cp.sh b/usr/local/share/bastille/cp.sh index 94c11bc8..c54e08b5 100644 --- a/usr/local/share/bastille/cp.sh +++ b/usr/local/share/bastille/cp.sh @@ -88,9 +88,6 @@ set_target "${TARGET}" for _jail in ${JAILS}; do - # Print blank line in front of first jail - [ "${_jail}" = "${_FIRST_JAIL}" ] && echo "" - info "[${_jail}]:" host_path="${HOST_PATH}" diff --git a/usr/local/share/bastille/destroy.sh b/usr/local/share/bastille/destroy.sh index b6134a1c..a77d8495 100644 --- a/usr/local/share/bastille/destroy.sh +++ b/usr/local/share/bastille/destroy.sh @@ -52,9 +52,6 @@ destroy_jail() { for _jail in ${JAILS}; do - # Print blank line in front of first jail - [ "${_jail}" = "${_FIRST_JAIL}" ] && echo "" - bastille_jail_base="${bastille_jailsdir}/${_jail}" bastille_jail_log="${bastille_logsdir}/${_jail}_console.log" diff --git a/usr/local/share/bastille/jcp.sh b/usr/local/share/bastille/jcp.sh index ee44bbba..8620e899 100644 --- a/usr/local/share/bastille/jcp.sh +++ b/usr/local/share/bastille/jcp.sh @@ -94,9 +94,6 @@ for _jail in ${DEST_TARGET}; do continue else - # Print blank line in front of first jail - [ "${_jail}" = "${_FIRST_JAIL}" ] && echo "" - info "[${_jail}]:" source_path="$(echo ${bastille_jailsdir}/${SOURCE_TARGET}/root/${SOURCE_PATH} | sed 's#//#/#g')" diff --git a/usr/local/share/bastille/limits.sh b/usr/local/share/bastille/limits.sh index ce2318ec..691183e1 100644 --- a/usr/local/share/bastille/limits.sh +++ b/usr/local/share/bastille/limits.sh @@ -109,9 +109,6 @@ for _jail in ${JAILS}; do error_notify "Jail is not running." error_continue "Use [-a|--auto] to auto-start the jail." fi - - # Print blank line in front of first jail - [ "${_jail}" = "${_FIRST_JAIL}" ] && echo "" info "[${_jail}]:" diff --git a/usr/local/share/bastille/mount.sh b/usr/local/share/bastille/mount.sh index 694f29aa..ad8a8a16 100644 --- a/usr/local/share/bastille/mount.sh +++ b/usr/local/share/bastille/mount.sh @@ -150,9 +150,6 @@ for _jail in ${JAILS}; do error_exit "Use [-a|--auto] to auto-start the jail." fi - # Print blank line in front of first jail - [ "${_jail}" = "${_FIRST_JAIL}" ] && echo "" - info "[${_jail}]:" _fullpath_fstab="$( echo "${bastille_jailsdir}/${_jail}/root/${_jailpath_fstab}" 2>/dev/null | sed 's#//#/#' )" diff --git a/usr/local/share/bastille/pkg.sh b/usr/local/share/bastille/pkg.sh index 3b854e64..963b3da0 100644 --- a/usr/local/share/bastille/pkg.sh +++ b/usr/local/share/bastille/pkg.sh @@ -104,9 +104,6 @@ for _jail in ${JAILS}; do error_continue "Use [-a|--auto] to auto-start the jail." fi - # Print blank line in front of first jail - [ "${_jail}" = "${_FIRST_JAIL}" ] && echo "" - info "[${_jail}]:" bastille_jail_path="${bastille_jailsdir}/${_jail}/root" diff --git a/usr/local/share/bastille/service.sh b/usr/local/share/bastille/service.sh index 7f2124b5..0da284b6 100644 --- a/usr/local/share/bastille/service.sh +++ b/usr/local/share/bastille/service.sh @@ -95,9 +95,6 @@ for _jail in ${JAILS}; do error_continue "Use [-a|--auto] to auto-start the jail." fi - # Print blank line in front of first jail - [ "${_jail}" = "${_FIRST_JAIL}" ] && echo "" - info "[${_jail}]:" jexec -l "${_jail}" /usr/sbin/service "$@" diff --git a/usr/local/share/bastille/start.sh b/usr/local/share/bastille/start.sh index 3b3d1ee1..395b9a33 100644 --- a/usr/local/share/bastille/start.sh +++ b/usr/local/share/bastille/start.sh @@ -110,9 +110,6 @@ for _jail in ${JAILS}; do continue fi fi - - # Print blank line in front of first jail - [ "${_jail}" = "${_FIRST_JAIL}" ] && echo "" info "[${_jail}]:" diff --git a/usr/local/share/bastille/stop.sh b/usr/local/share/bastille/stop.sh index 15795c61..730e59ab 100644 --- a/usr/local/share/bastille/stop.sh +++ b/usr/local/share/bastille/stop.sh @@ -86,9 +86,6 @@ set_target "${TARGET}" "reverse" for _jail in ${JAILS}; do - # Print blank line in front of first jail - [ "${_jail}" = "${_FIRST_JAIL}" ] && echo "" - info "[${_jail}]:" check_target_is_running "${_jail}" || error_continue "Jail is already stopped." diff --git a/usr/local/share/bastille/sysrc.sh b/usr/local/share/bastille/sysrc.sh index f30f3666..d766e10d 100644 --- a/usr/local/share/bastille/sysrc.sh +++ b/usr/local/share/bastille/sysrc.sh @@ -94,9 +94,6 @@ for _jail in ${JAILS}; do error_notify "Jail is not running." error_continue "Use [-a|--auto] to auto-start the jail." fi - - # Print blank line in front of first jail - [ "${_jail}" = "${_FIRST_JAIL}" ] && echo "" info "[${_jail}]:" diff --git a/usr/local/share/bastille/tags.sh b/usr/local/share/bastille/tags.sh index 2be4fbcc..e971dcc0 100644 --- a/usr/local/share/bastille/tags.sh +++ b/usr/local/share/bastille/tags.sh @@ -76,9 +76,6 @@ set_target "${TARGET}" for _jail in ${JAILS}; do - # Print blank line in front of first jail - [ "${_jail}" = "${_FIRST_JAIL}" ] && echo "" - bastille_jail_tags="${bastille_jailsdir}/${_jail}/tags" case ${ACTION} in add) diff --git a/usr/local/share/bastille/template.sh b/usr/local/share/bastille/template.sh index 9c361b31..069d420e 100644 --- a/usr/local/share/bastille/template.sh +++ b/usr/local/share/bastille/template.sh @@ -277,9 +277,6 @@ for _jail in ${JAILS}; do error_notify "Jail is not running." error_continue "Use [-a|--auto] to auto-start the jail." fi - - # Print blank line in front of first jail - [ "${_jail}" = "${_FIRST_JAIL}" ] && echo "" info "[${_jail}]:" diff --git a/usr/local/share/bastille/umount.sh b/usr/local/share/bastille/umount.sh index 8fc36133..91ddb952 100644 --- a/usr/local/share/bastille/umount.sh +++ b/usr/local/share/bastille/umount.sh @@ -95,9 +95,6 @@ for _jail in ${JAILS}; do error_exit "Use [-a|--auto] to auto-start the jail." fi - # Print blank line in front of first jail - [ "${_jail}" = "${_FIRST_JAIL}" ] && echo "" - info "[${_jail}]:" _jailpath="$( echo "${bastille_jailsdir}/${_jail}/root/${MOUNT_PATH}" 2>/dev/null | sed 's#//#/#' | sed 's#\\##g')"