Update debian-v3.sh

ct/debian-v3.sh

@@ -10,7 +10,6 @@ GN=`echo "\033[32m"`
 CL=`echo "\033[m"`
 APP="Debian"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
-PVE=$(pveversion | grep "pve-manager/7" | wc -l)
 while true; do
     read -p "This will create a New ${APP} LXC. Proceed(y/n)?" yn
     case $yn in
@@ -34,6 +33,8 @@ ${CL}"
 header_info
 
 function PVE_CHECK() {
+    PVE=$(pveversion | grep "pve-manager/7" | wc -l)
+
     if [[ $PVE != 1 ]]; then
         echo -e "${RD}This script requires Proxmox Virtual Environment 7.0 or greater${CL}"
         echo -e "Exiting..."
@@ -55,9 +56,7 @@ function default_settings() {
 		echo -e "${GN}Using CT Name ${BGN}$NSAPP${CL}"
 		HN=$NSAPP
 		echo -e "${GN}Using Disk Size ${BGN}2GB${CL}"
-		SIZEDISK="2"
+		DISK_SIZE="2"
-#		echo -e "${GN}Using Storage ${BGN}local-lvm${CL}"
-#		STORAGETYPE="local-lvm"
 		echo -e "${GN}Using ${BGN}1vCPU${CL}"
 		CORE_COUNT="1"
 		echo -e "${GN}Using ${BGN}512MiB${CL}${GN} RAM${CL}"
@@ -94,7 +93,6 @@ header_info
         else
           PW="-password $PW1"
         echo -en "${GN}Set CT Password ${BL}$PW1${CL}"
-
         fi;
 echo -e " ${CM}${CL} \r"
 sleep 1
@@ -133,42 +131,20 @@ header_info
         echo -e "${GN}Using ID ${BGN}$CT_ID${CL}"
         echo -e "${GN}Using CT Name ${BGN}$HN${CL}"
         echo -e "${YW}Enter a Disk Size, or Press [ENTER] for Default: 2Gb "
-                read SIZEDISK
+        read DISK_SIZE
-                if [ -z $SIZEDISK ]; then SIZEDISK="2"; fi;
+        if [ -z $DISK_SIZE ]; then DISK_SIZE="2"; fi;
-                if ! [[ $SIZEDISK =~ $INTEGER ]] ; then echo "ERROR! DISK SIZE MUST HAVE INTEGER NUMBER!"; exit; fi;
+        if ! [[ $DISK_SIZE =~ $INTEGER ]] ; then echo "ERROR! DISK SIZE MUST HAVE INTEGER NUMBER!"; exit; fi;
-                echo -en "${GN}Set Disk Size To ${BL}$SIZEDISK${CL}"
+        echo -en "${GN}Set Disk Size To ${BL}$DISK_SIZE${CL}"
 echo -e " ${CM}${CL} \r"
 sleep 1
 clear
 header_info
-#                echo -e "${RD}Using Advanced Settings${CL}"
-#                echo -e "${GN}Using CT Type ${BGN}$CT_TYPE1${CL}"
-#                echo -e "${GN}Using CT Password ${BGN}$PW1${CL}"
-#                echo -e "${GN}Using ID ${BGN}$CT_ID${CL}"
-#                echo -e "${GN}Using CT Name ${BGN}$HN${CL}"
-#                echo -e "${GN}Using Disk Size ${BGN}$SIZEDISK${CL}"
-#                echo -e "${YW}Storages Available:${CL}"
-#                echo " "
-#                for stg in `pvesh get storage --noborder --noheader`
-#                do
-#                        echo -e "${BL}     - ${stg}${CL}"
-#                done
-#                echo " "
-#                echo -e "${YW}Enter which storage to create the CT, or Press [ENTER] for Default: local-lvm "
-#                read STORAGETYPE
-#                if [ -z $STORAGETYPE ]; then STORAGETYPE="local-lvm"; fi;
-#                echo -en "${GN}Set Storage To ${BL}$STORAGETYPE${CL}"
-#echo -e " ${CM}${CL} \r"
-#sleep 1
-#clear
-#header_info
         echo -e "${RD}Using Advanced Settings${CL}"
         echo -e "${GN}Using CT Type ${BGN}$CT_TYPE1${CL}"
         echo -e "${GN}Using CT Password ${BGN}$PW1${CL}"
         echo -e "${GN}Using ID ${BGN}$CT_ID${CL}"
         echo -e "${GN}Using CT Name ${BGN}$HN${CL}"
-                echo -e "${GN}Using Disk Size ${BGN}$SIZEDISK${CL}"
+        echo -e "${GN}Using Disk Size ${BGN}$DISK_SIZE${CL}"
-#                echo -e "${GN}Using Storage ${BGN}$STORAGETYPE${CL}"
         echo -e "${YW}Allocate CPU cores, or Press [ENTER] for Default: 1 "
         read CORE_COUNT
         if [ -z $CORE_COUNT ]; then CORE_COUNT="1"; fi;
@@ -182,8 +158,7 @@ header_info
         echo -e "${GN}Using CT Password ${BGN}$PW1${CL}"
         echo -e "${GN}Using ID ${BGN}$CT_ID${CL}"
         echo -e "${GN}Using CT Name ${BGN}$HN${CL}"
-                echo -e "${GN}Using Disk Size ${BGN}$SIZEDISK${CL}"
+        echo -e "${GN}Using Disk Size ${BGN}$DISK_SIZE${CL}"
-#                echo -e "${GN}Using Storage ${BGN}$STORAGETYPE${CL}"
         echo -e "${GN}Using ${BGN}${CORE_COUNT}vCPU${CL}"
         echo -e "${YW}Allocate RAM in MiB, or Press [ENTER] for Default: 512 "
         read RAM_SIZE
@@ -198,8 +173,7 @@ header_info
         echo -e "${GN}Using CT Password ${BGN}$PW1${CL}"
         echo -e "${GN}Using ID ${BGN}$CT_ID${CL}"
         echo -e "${GN}Using CT Name ${BGN}$HN${CL}"
-                echo -e "${GN}Using Disk Size ${BGN}$SIZEDISK${CL}"
+        echo -e "${GN}Using Disk Size ${BGN}$DISK_SIZE${CL}"
-#                echo -e "${GN}Using Storage ${BGN}$STORAGETYPE${CL}"
         echo -e "${GN}Using ${BGN}${CORE_COUNT}vCPU${CL}"
         echo -e "${GN}Using ${BGN}${RAM_SIZE}MiB${CL}${GN} RAM${CL}"
         echo -e "${YW}Enter a IP Address, or Press [ENTER] for Default: DHCP "
@@ -215,8 +189,7 @@ header_info
         echo -e "${GN}Using CT Password ${BGN}$PW1${CL}"
         echo -e "${GN}Using ID ${BGN}$CT_ID${CL}"
         echo -e "${GN}Using CT Name ${BGN}$HN${CL}"
-                echo -e "${GN}Using Disk Size ${BGN}$SIZEDISK${CL}"
+        echo -e "${GN}Using Disk Size ${BGN}$DISK_SIZE${CL}"
-#                echo -e "${GN}Using Storage ${BGN}$STORAGETYPE${CL}"
         echo -e "${GN}Using ${BGN}${CORE_COUNT}vCPU${CL}"
         echo -e "${GN}Using ${BGN}${RAM_SIZE}MiB${CL}${GN} RAM${CL}"
         echo -e "${GN}Using IP Address ${BGN}$NET${CL}"
@@ -237,8 +210,7 @@ header_info
         echo -e "${GN}Using CT Password ${BGN}$PW1${CL}"
         echo -e "${GN}Using ID ${BGN}$CT_ID${CL}"
         echo -e "${GN}Using CT Name ${BGN}$HN${CL}"
-                echo -e "${GN}Using Disk Size ${BGN}$SIZEDISK${CL}"
+        echo -e "${GN}Using Disk Size ${BGN}$DISK_SIZE${CL}"
-#                echo -e "${GN}Using Storage ${BGN}$STORAGETYPE${CL}"
         echo -e "${GN}Using ${BGN}${CORE_COUNT}vCPU${CL}"
         echo -e "${GN}Using ${BGN}${RAM_SIZE}MiB${CL}${GN} RAM${CL}"
         echo -e "${GN}Using IP Address ${BGN}$NET${CL}"
@@ -327,7 +299,7 @@ pushd $TEMP_DIR >/dev/null
 export CTID=$CT_ID
 export PCT_OSTYPE=debian
 export PCT_OSVERSION=11
-export PCT_DISK_SIZE=$SIZEDISK
+export PCT_DISK_SIZE=$DISK_SIZE
 export PCT_OPTIONS="
   -features $FEATURES
   -hostname $HN