From c22b508d25e19dcc910b9a8cc700bdd161abbbc1 Mon Sep 17 00:00:00 2001 From: Jose Date: Tue, 8 Oct 2019 03:00:32 -0400 Subject: [PATCH] Fix jail and releases output listing --- usr/local/share/bastille/list.sh | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/usr/local/share/bastille/list.sh b/usr/local/share/bastille/list.sh index 31e509ac..ea55ae4e 100644 --- a/usr/local/share/bastille/list.sh +++ b/usr/local/share/bastille/list.sh @@ -47,13 +47,23 @@ if [ $# -gt 0 ]; then usage ;; release|releases) - find "${bastille_releasesdir}" -type d -maxdepth 1 + REL_LIST=$(ls "${bastille_releasesdir}" | sed "s/\n//g") + for _REL in ${REL_LIST}; do + if [ -f "${bastille_releasesdir}/${_REL}/root/.profile" ]; then + echo "${bastille_releasesdir}/${_REL}" + fi + done ;; template|templates) - find "${bastille_templatesdir}" -type d -maxdepth 2 + find "${bastille_templatesdir}" -type d -maxdepth 2 ;; jail|jails) - ls "${bastille_jailsdir}" | sed "s/\n//g" + JAIL_LIST=$(ls "${bastille_jailsdir}" | sed "s/\n//g") + for _JAIL in ${JAIL_LIST}; do + if [ -f "${bastille_jailsdir}/${_JAIL}/jail.conf" ]; then + echo "${_JAIL}" + fi + done ;; log|logs) find "${bastille_logsdir}" -type f -maxdepth 1