From 56615fbe793af35dd498ccce7bd75f33faba6030 Mon Sep 17 00:00:00 2001 From: tteckster Date: Tue, 30 Aug 2022 19:59:07 -0400 Subject: [PATCH] Update create_lxc.sh --- ct/create_lxc.sh | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/ct/create_lxc.sh b/ct/create_lxc.sh index 82269485..f82768a5 100644 --- a/ct/create_lxc.sh +++ b/ct/create_lxc.sh @@ -5,6 +5,7 @@ RD=`echo "\033[01;31m"` GN=`echo "\033[1;92m"` CL=`echo "\033[m"` CM="${GN}✓${CL}" +CROSS="${RD}✗${CL}" BFR="\\r\\033[K" HOLD="-" set -o errexit @@ -33,7 +34,15 @@ function msg_ok() { local msg="$1" echo -e "${BFR} ${CM} ${GN}${msg}${CL}" } +function msg_error() { + local msg="$1" + echo -e "${BFR} ${CROSS} ${RD}${msg}${CL}" +} + msg_info "Validating Storage" +VALID=$(pvesm status -content rootdir | awk 'NR>1') +if [ -z "$VALID" ]; then msg_error "Unable to detect a valid storage location."; exit 1; fi; + function select_storage() { local CLASS=$1 local CONTENT @@ -57,10 +66,7 @@ function select_storage() { MENU+=( "$TAG" "$ITEM" "OFF" ) done < <(pvesm status -content $CONTENT | awk 'NR>1') - if [ $((${#MENU[@]}/3)) -eq 0 ]; then - echo -e "'$CONTENT_LABEL' needs to be selected for at least one storage location." - die "Unable to detect valid storage location." - elif [ $((${#MENU[@]}/3)) -eq 1 ]; then + if [ $((${#MENU[@]}/3)) -eq 1 ]; then printf ${MENU[0]} else local STORAGE @@ -117,4 +123,3 @@ msg_info "Creating LXC Container" pct create $CTID ${TEMPLATE_STORAGE}:vztmpl/${TEMPLATE} ${PCT_OPTIONS[@]} >/dev/null || die "A problem occured while trying to create container." msg_ok "LXC Container ${BL}$CTID${CL} ${GN}was successfully created." -