BastilleBSD/bastille
2
0
Fork 0
Code Pull Requests Actions Packages Releases Activity

updating Usage output and formatting case statements

Browse Source
This commit is contained in:
Christer Edwards
2019-11-22 22:02:34 -07:00
parent 03be9fc033
commit 9d352588f1
1 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
usr/local/share/bastille/destroy.sh
+19 -17
View File
@@ -32,7 +32,7 @@
. /usr/local/etc/bastille/bastille.conf . /usr/local/etc/bastille/bastille.conf
usage() { usage() {
echo -e "${COLOR_RED}Usage: bastille destroy name.${COLOR_RESET}" echo -e "${COLOR_RED}Usage: bastille destroy [container|release]${COLOR_RESET}"
exit 1 exit 1
} }
@@ -137,26 +137,28 @@ NAME="$1"
## check what should we clean ## check what should we clean
case "${NAME}" in case "${NAME}" in
*-RELEASE|*-release|*-RC1|*-rc1|*-RC2|*-rc2) *-RELEASE|*-release|*-RC1|*-rc1|*-RC2|*-rc2)
## check for FreeBSD releases name ## check for FreeBSD releases name
NAME_VERIFY=$(echo "${NAME}" | grep -iwE '^([1-9]{2,2})\.[0-9](-RELEASE|-RC[1-2])$' | tr '[:lower:]' '[:upper:]') NAME_VERIFY=$(echo "${NAME}" | grep -iwE '^([1-9]{2,2})\.[0-9](-RELEASE|-RC[1-2])$' | tr '[:lower:]' '[:upper:]')
if [ -n "${NAME_VERIFY}" ]; then if [ -n "${NAME_VERIFY}" ]; then
NAME="${NAME_VERIFY}" NAME="${NAME_VERIFY}"
destroy_rel destroy_rel
else else
usage usage
fi fi
;; ;;
*-stable-LAST|*-STABLE-last|*-stable-last|*-STABLE-LAST) *-stable-LAST|*-STABLE-last|*-stable-last|*-STABLE-LAST)
## check for HardenedBSD releases name ## check for HardenedBSD releases name
NAME_VERIFY=$(echo "${NAME}" | grep -iwE '^([1-9]{2,2})(-stable-LAST|-STABLE-last|-stable-last|-STABLE-LAST)$' | sed 's/STABLE/stable/g' | sed 's/last/LAST/g') NAME_VERIFY=$(echo "${NAME}" | grep -iwE '^([1-9]{2,2})(-stable-LAST|-STABLE-last|-stable-last|-STABLE-LAST)$' | sed 's/STABLE/stable/g' | sed 's/last/LAST/g')
if [ -n "${NAME_VERIFY}" ]; then if [ -n "${NAME_VERIFY}" ]; then
NAME="${NAME_VERIFY}" NAME="${NAME_VERIFY}"
destroy_rel destroy_rel
else else
usage usage
fi fi
;; ;;
*) *)
## just destroy a jail ## just destroy a jail
destroy_jail destroy_jail
;; ;;