Added some more nodered modules. Removed override file. Added branch selection

Author: Slyke

.templates/nodered/build.sh

@@ -6,7 +6,13 @@ node_selection=$(whiptail --title "Node-RED nodes" --checklist --separate-output
 	"Use the [SPACEBAR] to select the nodes you want preinstalled" 20 78 12 -- \
 	"node-red-node-pi-gpiod" " " "ON" \
 	"node-red-dashboard" " " "ON" \
+	"node-red-contrib-influxdb" " " "ON" \
+	"node-red-contrib-boolean-logic" " " "ON" \
+	"node-red-node-rbe" " " "ON" \
+	"node-red-configurable-ping" " " "ON" \
 	"node-red-node-openweathermap" " " "OFF" \
+	"node-red-contrib-discord" " " "OFF" \
+	"node-red-node-email" " " "on" \
 	"node-red-node-google" " " "OFF" \
 	"node-red-node-emoncms" " " "OFF" \
 	"node-red-node-geofence" " " "OFF" \
@@ -15,7 +21,6 @@ node_selection=$(whiptail --title "Node-RED nodes" --checklist --separate-output
 	"node-red-node-smooth" " " "OFF" \
 	"node-red-node-darksky" " " "OFF" \
 	"node-red-node-sqlite" " " "OFF" \
-	"node-red-contrib-influxdb" " " "ON" \
 	"node-red-contrib-config" " " "OFF" \
 	"node-red-contrib-grove" " " "OFF" \
 	"node-red-contrib-diode" " " "OFF" \
@@ -29,7 +34,6 @@ node_selection=$(whiptail --title "Node-RED nodes" --checklist --separate-output
 	"node-red-contrib-isonline" " " "OFF" \
 	"node-red-contrib-npm" " " "OFF" \
 	"node-red-contrib-file-function" " " "OFF" \
-	"node-red-contrib-boolean-logic" " " "OFF" \
 	"node-red-contrib-home-assistant-websocket" " " "OFF" \
 	"node-red-contrib-blynk-ws" " " "OFF" \
 	"node-red-contrib-owntracks" " " "OFF" \

compose-override.yml

@@ -3,6 +3,8 @@
 #get path of menu correct
 pushd ~/IOTstack
 
+CURRENT_BRANCH=${1:-$(git name-rev --name-only HEAD)}
+
 # Consts/vars
 TMP_DOCKER_COMPOSE_YML=./.tmp/docker-compose.tmp.yml
 DOCKER_COMPOSE_YML=./docker-compose.yml
@@ -602,7 +604,7 @@ case $mainmenu_selection in
 	;;
 "update")
 	echo "Pulling latest project file from Github.com ---------------------------------------------"
-	git pull origin master
+	git pull origin $CURRENT_BRANCH
 	echo "git status ------------------------------------------------------------------------------"
 	git status
 	;;