From 7ec8040b1f12b516b799f7ec52fb0d4db05a735f Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Wed, 15 Nov 2023 16:28:29 -0600 Subject: [PATCH] Update sites.inc --- inc/sites.inc | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/inc/sites.inc b/inc/sites.inc index 61f72734..c95eb5d9 100755 --- a/inc/sites.inc +++ b/inc/sites.inc @@ -155,13 +155,17 @@ NEWSITE(){ # echo # fi if [ -z ${SITE_TYPE+x} ]; then - echo -en "${idsCL[LightCyan]}Site type (local/{proxy}): ${idsCL[Default]}" - read SITE_TYPE + until [ "${SITE_TYPE}" == "proxy" ]; do + echo -en "${idsCL[LightCyan]}Site type (local/{proxy}): ${idsCL[Default]}" + read SITE_TYPE + if [ "${SITE_TYPE}" == "" ]; then + SITE_TYPE=proxy + else + SITE_TYPE=${SITE_TYPE,,} + fi + echo + done showdivide=yes - if [ "${SITE_TYPE}" = "" ]; then - SITE_TYPE=proxy - fi - echo fi if [ "${SITE_TYPE}" = "proxy" ]; then if [ -z ${PROXYHOST+x} ]; then @@ -181,9 +185,10 @@ NEWSITE(){ showdivide=yes fi if [ -z ${PROXYSCHEME+x} ]; then - until [ "${PROXYSCHEME}" != "" ]; do + until [ "${PROXYSCHEME}" == "http" ] || [ "${PROXYSCHEME}" == "https" ]; do echo -en "${idsCL[LightCyan]}What is the proxy backend scheme (http/https): ${idsCL[Default]}" read PROXYSCHEME + [ "${PROXYSCHEME}" != "" ] && PROXYSCHEME=${PROXYSCHEME,,} echo done showdivide=yes