Keep options simple yet support for long options

This commit is contained in:
Jose
2020-02-19 19:53:25 -04:00
parent 5b25dbcdc5
commit e26fe60fe4

View File

@@ -381,56 +381,40 @@ fi
THICK_JAIL="" THICK_JAIL=""
VNET_JAIL="" VNET_JAIL=""
## handle combined options ## handle combined options then shift
if [ "${1}" = "-T" -o "${1}" = "--thick" -o "${1}" = "thick" ] && \ if [ "${1}" = "-T" -o "${1}" = "--thick" -o "${1}" = "thick" ] && \
[ "${2}" = "-V" -o "${2}" = "--vnet" -o "${2}" = "vnet" ]; then [ "${2}" = "-V" -o "${2}" = "--vnet" -o "${2}" = "vnet" ]; then
NAME="$3"
RELEASE="$4"
IP="$5"
INTERFACE="$6"
if [ $# -gt 6 ] || [ $# -lt 5 ]; then
usage
fi
THICK_JAIL="1" THICK_JAIL="1"
VNET_JAIL="1" VNET_JAIL="1"
break shift 2
else else
## handle single options ## handle single options
NAME="$2"
RELEASE="$3"
IP="$4"
INTERFACE="$5"
case "${1}" in case "${1}" in
-T|--thick|thick) -T|--thick|thick)
if [ $# -gt 5 ] || [ $# -lt 4 ]; then shift 1
usage
fi
THICK_JAIL="1" THICK_JAIL="1"
break
;; ;;
-V|--vnet|vnet) -V|--vnet|vnet)
if [ $# -gt 5 ] || [ $# -lt 4 ]; then shift 1
usage
fi
VNET_JAIL="1" VNET_JAIL="1"
break
;; ;;
-*) -*)
echo -e "${COLOR_RED}Unknown Option.${COLOR_RESET}" echo -e "${COLOR_RED}Unknown Option.${COLOR_RESET}"
usage usage
;; ;;
*) *)
if [ $# -gt 4 ] || [ $# -lt 3 ]; then break
usage ;;
esac
fi fi
NAME="$1" NAME="$1"
RELEASE="$2" RELEASE="$2"
IP="$3" IP="$3"
INTERFACE="$4" INTERFACE="$4"
;;
esac if [ $# -gt 4 ] || [ $# -lt 3 ]; then
usage
fi fi
## don't allow for dots(.) in container names ## don't allow for dots(.) in container names