From 5801b47b04e0da5b1fd91d71bb4b8077c7399907 Mon Sep 17 00:00:00 2001 From: tteckster Date: Sun, 17 Apr 2022 23:43:14 -0400 Subject: [PATCH] Update zigbee2mqtt-v3.sh --- ct/zigbee2mqtt-v3.sh | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/ct/zigbee2mqtt-v3.sh b/ct/zigbee2mqtt-v3.sh index c4d08d77..7dec3b70 100644 --- a/ct/zigbee2mqtt-v3.sh +++ b/ct/zigbee2mqtt-v3.sh @@ -68,7 +68,7 @@ function default_settings() { CT_TYPE="0" echo -e "${DGN}Using CT Password ${BGN}Automatic Login${CL}" PW=" " - echo -e "${DGN}Using ID ${BGN}$NEXTID${CL}" + echo -e "${DGN}Using CT ID ${BGN}$NEXTID${CL}" CT_ID=$NEXTID echo -e "${DGN}Using CT Name ${BGN}$NSAPP${CL}" HN=$NSAPP @@ -78,7 +78,7 @@ function default_settings() { CORE_COUNT="2" echo -e "${DGN}Using ${BGN}1024MiB${CL}${DGN} RAM${CL}" RAM_SIZE="1024" - echo -e "${DGN}Using IP Address ${BGN}DHCP${CL}" + echo -e "${DGN}Using Static IP Address ${BGN}DHCP${CL}" NET=dhcp echo -e "${DGN}Using Gateway Address ${BGN}NONE${CL}" GATE=" " @@ -131,7 +131,7 @@ header_info echo -e "${RD}Using Advanced Settings${CL}" echo -e "${DGN}Using CT Type ${BGN}$CT_TYPE1${CL}" echo -e "${DGN}Using CT Password ${BGN}$PW1${CL}" - echo -e "${DGN}Using ID ${BGN}$CT_ID${CL}" + echo -e "${DGN}Using CT ID ${BGN}$CT_ID${CL}" echo -e "${YW}Enter CT Name (no-spaces), or Press [ENTER] for Default: $NSAPP " read CT_NAME if [ -z $CT_NAME ]; then @@ -147,7 +147,7 @@ header_info echo -e "${RD}Using Advanced Settings${CL}" echo -e "${DGN}Using CT Type ${BGN}$CT_TYPE1${CL}" echo -e "${DGN}Using CT Password ${BGN}$PW1${CL}" - echo -e "${DGN}Using ID ${BGN}$CT_ID${CL}" + echo -e "${DGN}Using CT ID ${BGN}$CT_ID${CL}" echo -e "${DGN}Using CT Name ${BGN}$HN${CL}" echo -e "${YW}Enter a Disk Size, or Press [ENTER] for Default: 4Gb " read DISK_SIZE @@ -161,7 +161,7 @@ header_info echo -e "${RD}Using Advanced Settings${CL}" echo -e "${DGN}Using CT Type ${BGN}$CT_TYPE1${CL}" echo -e "${DGN}Using CT Password ${BGN}$PW1${CL}" - echo -e "${DGN}Using ID ${BGN}$CT_ID${CL}" + echo -e "${DGN}Using CT ID ${BGN}$CT_ID${CL}" echo -e "${DGN}Using CT Name ${BGN}$HN${CL}" echo -e "${DGN}Using Disk Size ${BGN}$DISK_SIZE${CL}" echo -e "${YW}Allocate CPU cores, or Press [ENTER] for Default: 2 " @@ -175,7 +175,7 @@ header_info echo -e "${RD}Using Advanced Settings${CL}" echo -e "${DGN}Using CT Type ${BGN}$CT_TYPE1${CL}" echo -e "${DGN}Using CT Password ${BGN}$PW1${CL}" - echo -e "${DGN}Using ID ${BGN}$CT_ID${CL}" + echo -e "${DGN}Using CT ID ${BGN}$CT_ID${CL}" echo -e "${DGN}Using CT Name ${BGN}$HN${CL}" echo -e "${DGN}Using Disk Size ${BGN}$DISK_SIZE${CL}" echo -e "${DGN}Using ${BGN}${CORE_COUNT}vCPU${CL}" @@ -190,15 +190,15 @@ header_info echo -e "${RD}Using Advanced Settings${CL}" echo -e "${DGN}Using CT Type ${BGN}$CT_TYPE1${CL}" echo -e "${DGN}Using CT Password ${BGN}$PW1${CL}" - echo -e "${DGN}Using ID ${BGN}$CT_ID${CL}" + echo -e "${DGN}Using CT ID ${BGN}$CT_ID${CL}" echo -e "${DGN}Using CT Name ${BGN}$HN${CL}" echo -e "${DGN}Using Disk Size ${BGN}$DISK_SIZE${CL}" echo -e "${DGN}Using ${BGN}${CORE_COUNT}vCPU${CL}" echo -e "${DGN}Using ${BGN}${RAM_SIZE}MiB${CL}${DGN} RAM${CL}" - echo -e "${YW}Enter a IP Address, or Press [ENTER] for Default: DHCP " + echo -e "${YW}Enter a Static IP Address, or Press [ENTER] for Default: DHCP " read NET if [ -z $NET ]; then NET="dhcp"; fi; - echo -en "${DGN}Set IP Address To ${BL}$NET${CL}" + echo -en "${DGN}Set Static IP Address To ${BL}$NET${CL}" echo -e " ${CM}${CL} \n" sleep 1 clear @@ -206,12 +206,12 @@ header_info echo -e "${RD}Using Advanced Settings${CL}" echo -e "${DGN}Using CT Type ${BGN}$CT_TYPE1${CL}" echo -e "${DGN}Using CT Password ${BGN}$PW1${CL}" - echo -e "${DGN}Using ID ${BGN}$CT_ID${CL}" + echo -e "${DGN}Using CT ID ${BGN}$CT_ID${CL}" echo -e "${DGN}Using CT Name ${BGN}$HN${CL}" echo -e "${DGN}Using Disk Size ${BGN}$DISK_SIZE${CL}" echo -e "${DGN}Using ${BGN}${CORE_COUNT}vCPU${CL}" echo -e "${DGN}Using ${BGN}${RAM_SIZE}MiB${CL}${DGN} RAM${CL}" - echo -e "${DGN}Using IP Address ${BGN}$NET${CL}" + echo -e "${DGN}Using Static IP Address ${BGN}$NET${CL}" echo -e "${YW}Enter a Gateway IP, or Press [ENTER] for Default: NONE " read GATE1 if [ -z $GATE1 ]; then GATE1="NONE" GATE=" "; @@ -228,12 +228,12 @@ header_info echo -e "${RD}Using Advanced Settings${CL}" echo -e "${DGN}Using CT Type ${BGN}$CT_TYPE1${CL}" echo -e "${DGN}Using CT Password ${BGN}$PW1${CL}" - echo -e "${DGN}Using ID ${BGN}$CT_ID${CL}" + echo -e "${DGN}Using CT ID ${BGN}$CT_ID${CL}" echo -e "${DGN}Using CT Name ${BGN}$HN${CL}" echo -e "${DGN}Using Disk Size ${BGN}$DISK_SIZE${CL}" echo -e "${DGN}Using ${BGN}${CORE_COUNT}vCPU${CL}" echo -e "${DGN}Using ${BGN}${RAM_SIZE}MiB${CL}${DGN} RAM${CL}" - echo -e "${DGN}Using IP Address ${BGN}$NET${CL}" + echo -e "${DGN}Using Static IP Address ${BGN}$NET${CL}" echo -e "${DGN}Using Gateway IP Address ${BGN}$GATE1${CL}" echo -e "${YW}Enter a VLAN Tag, or Press [ENTER] for Default: NONE " read VLAN1 @@ -250,12 +250,12 @@ header_info echo -e "${RD}Using Advanced Settings${CL}" echo -e "${DGN}Using CT Type ${BGN}$CT_TYPE1${CL}" echo -e "${DGN}Using CT Password ${BGN}$PW1${CL}" - echo -e "${DGN}Using ID ${BGN}$CT_ID${CL}" + echo -e "${DGN}Using CT ID ${BGN}$CT_ID${CL}" echo -e "${DGN}Using CT Name ${BGN}$HN${CL}" echo -e "${DGN}Using Disk Size ${BGN}$DISK_SIZE${CL}" echo -e "${DGN}Using ${BGN}${CORE_COUNT}vCPU${CL}" echo -e "${DGN}Using ${BGN}${RAM_SIZE}MiB${CL}${DGN} RAM${CL}" - echo -e "${DGN}Using IP Address ${BGN}$NET${CL}" + echo -e "${DGN}Using Static IP Address ${BGN}$NET${CL}" echo -e "${DGN}Using Gateway IP Address ${BGN}$GATE1${CL}" echo -e "${DGN}Using VLAN Tag ${BGN}$VLAN1${CL}" read -p "Are these settings correct(y/n)? " -n 1 -r