Mirrors/hackacad
2
0
Fork 0
mirror of https://github.com/hackacad/bastille.git synced 2025-12-20 09:10:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Drop "search" in favor of "list"

Browse Source
This commit is contained in:
Lars Engels
2023-03-16 18:06:44 +01:00
parent 10d94668fc
commit 6776427e5a
1 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
usr/local/share/bastille/tags.sh
View File

@@ -33,13 +33,13 @@
. /usr/local/etc/bastille/bastille.conf . /usr/local/etc/bastille/bastille.conf
usage() { usage() {
error_notify "Usage: bastille tags TARGET add tag1,tag2,..." error_notify "Usage: bastille tags TARGET add tag1[,tag2,...]"
error_notify " bastille tags TARGET delete tag1,tag2,..." error_notify " bastille tags TARGET delete tag1[,tag2,...]"
error_notify " bastille tags TARGET search tag" error_notify " bastille tags TARGET list [tag]"
error_notify " bastille tags TARGET list"
echo -e "Example: bastille tags JAILNAME add database,mysql" echo -e "Example: bastille tags JAILNAME add database,mysql"
echo -e " bastille tags JAILNAME delete mysql" echo -e " bastille tags JAILNAME delete mysql"
echo -e " bastille tags ALL search mysql" echo -e " bastille tags ALL list"
echo -e " bastille tags ALL list mysql"
exit 1 exit 1
} }
@@ -78,19 +78,20 @@ for _jail in ${JAILS}; do
[ ! -s "${bastille_jail_tags}" ] && rm "${bastille_jail_tags}" [ ! -s "${bastille_jail_tags}" ] && rm "${bastille_jail_tags}"
done done
;; ;;
search)
[ -n "$(echo ${TAGS} | grep ,)" ] && usage # Only one tag per query
[ ! -f "${bastille_jail_tags}" ] && continue # skip if there is no tags file
grep -qE "^${TAGS}\$" "${bastille_jail_tags}"
if [ $? -eq 0 ]; then
echo "${_jail}"
continue
fi
;;
list) list)
if [ -f "${bastille_jail_tags}" ]; then if [ -n "${TAGS}" ]; then
echo -n "${_jail}: " [ -n "$(echo ${TAGS} | grep ,)" ] && usage # Only one tag per query
xargs < "${bastille_jail_tags}" [ ! -f "${bastille_jail_tags}" ] && continue # skip if there is no tags file
grep -qE "^${TAGS}\$" "${bastille_jail_tags}"
if [ $? -eq 0 ]; then
echo "${_jail}"
continue
fi
else
if [ -f "${bastille_jail_tags}" ]; then
echo -n "${_jail}: "
xargs < "${bastille_jail_tags}"
fi
fi fi
;; ;;
*) *)