fix bootstrap regression, make cp verbose, code cleanup

This commit is contained in:
Christer Edwards
2019-06-23 08:33:41 -06:00
parent 6a082113d6
commit 3d3fd9881b
3 changed files with 18 additions and 25 deletions

View File

@@ -32,7 +32,7 @@
. /usr/local/etc/bastille/bastille.conf
## version
BASTILLE_VERSION="0.3.20190622"
BASTILLE_VERSION="0.3.20190623"
usage() {
cat << EOF
@@ -77,23 +77,19 @@ shift
# Handle special-case commands first.
case "${CMD}" in
version|-v|--version)
echo -e "${COLOR_GREEN}${BASTILLE_VERSION}${COLOR_RESET}"
exit 0
;;
echo -e "${COLOR_GREEN}${BASTILLE_VERSION}${COLOR_RESET}"
exit 0
;;
help|-h|--help)
usage
;;
usage
;;
esac
# Filter out all non-commands
case "${CMD}" in
cmd|cp|create|destroy|list|pkg|restart|start|stop|sysrc|template|verify)
bootstrap|cmd|console|cp|create|destroy|htop|list|pkg|restart|service)
;;
update|upgrade)
;;
console|bootstrap|htop|top)
;;
bootstrap|update|upgrade|zfs)
start|stop|sysrc|template|top|update|upgrade|verify|zfs)
;;
*)
usage