Merge pull request #113 from cedwards/little_fixes

Minor fixes to create and import
This commit is contained in:
Christer Edwards
2020-01-28 17:41:59 -07:00
committed by GitHub
2 changed files with 4 additions and 5 deletions

View File

@@ -67,11 +67,10 @@ validate_ip() {
validate_netif() {
local LIST_INTERFACES=$(ifconfig -l)
interface=${INTERFACE}
if echo "${LIST_INTERFACES}" | grep -qwo "${INTERFACE}"; then
echo -e "${COLOR_GREEN}Valid: ($interface).${COLOR_RESET}"
if echo "${LIST_INTERFACES} VNET" | grep -qwo "${INTERFACE}"; then
echo -e "${COLOR_GREEN}Valid: (${INTERFACE}).${COLOR_RESET}"
else
echo -e "${COLOR_RED}Invalid: ($interface).${COLOR_RESET}"
echo -e "${COLOR_RED}Invalid: (${INTERFACE}).${COLOR_RESET}"
exit 1
fi
}

View File

@@ -32,7 +32,7 @@
. /usr/local/etc/bastille/bastille.conf
usage() {
echo -e "${COLOR_RED}Usage: bastille import [TARGET|list].${COLOR_RESET}"
echo -e "${COLOR_RED}Usage: bastille import backup_file.${COLOR_RESET}"
exit 1
}