homeassistant: исправления

profiles/templates/homeassistant/homeassistant/init.homeassistant

@@ -12,7 +12,7 @@ serverlog="/var/log/homeassistant/server.log"
 warningslog="/var/log/homeassistant/warnings.log"
 retry="20"
 
-command=/var/calculate/www/${RC_SVCNAME}/${RC_SVCNAME}-live/.venv/bin/hass
+command=/var/calculate/www/${RC_SVCNAME}/${RC_SVCNAME}-live/bin/hass
 directory=/var/calculate/www/${RC_SVCNAME}/${RC_SVCNAME}-live
 
 start_stop_daemon_args="--user $user --stdout $stdoutlog --stderr $serverlog --wait 10"

scripts/homeassistant/step/1-install.sh

@@ -15,24 +15,27 @@ configure() {
 	local live_dir="$home_dir/homeassistant-live"
 	local live_ver="$(get_live_ver $live_dir)"
 
+	# отобразим наличие обновления и выйдем
 	if [[ $action == 'check' ]]; then
 		if [[ $live_ver != $last_ver ]]; then
 			einfo "homeassistant: $last_ver update available, $live_ver installed"
-			eval $__result=1 # наличие обновления
+			eval $__result=1
 		fi
 		return 0
 	fi
 
+	# выйдем если нет обновления
+        [[ $live_ver == $last_ver ]] && return
+
+	# подготовим пути
 	if [[ ! -e $home_dir ]]; then
-		mkdir -p $home_dir/versions
+		mkdir -p ${home_dir}/versions
 		chmod 700 $home_dir
 		chown -R homeassistant: $home_dir
 	fi
-
 	touch ${log_dir}/homeassistant.log
 	chown homeassistant: ${log_dir}/homeassistant.log
 	
-	if [[ $live_ver != $last_ver ]]; then
 	if [[ $live_ver == '' ]]; then
 		echo Install Home Assistant
 	else
@@ -45,8 +48,8 @@ configure() {
 	
 		ebegin 'Create a virtualenv'
 		test -e ${work_dir} && rm -rf ${work_dir}
-			python -m venv ${work_dir}/.venv
-			source ${work_dir}/.venv/bin/activate
+		python -m venv ${work_dir}
+		source ${work_dir}/bin/activate
 		eend
 	
 		ebegin 'Install all Python dependencies'
@@ -69,5 +72,4 @@ configure() {
 		rc-service -s homeassistant restart
 		echo
 	fi
-	fi
 }

scripts/homeassistant/step/3-zigbee2mqtt.sh

@@ -17,10 +17,11 @@ configure() {
 	local live_ver="$(get_live_ver $live_dir)"
 	local conf_dir="/var/calculate/zigbee2mqtt"
 
+	# отобразим наличие обновления и выйдем
 	if [[ $action == 'check' ]]; then
 		if [[ $live_ver != $last_ver ]]; then
 			einfo "zigbee2mqtt: $last_ver update available, $live_ver installed"
-			eval $__result=1 # наличие обновления
+			eval $__result=1
 		fi
 		return 0
 	fi
@@ -36,8 +37,12 @@ configure() {
 		fi
 	fi
 
+	# выйдем если нет обновления
+	[[ $live_ver == $last_ver ]] && return
+
+	# подготовим пути
 	if [[ ! -e $home_dir ]]; then
-		mkdir -p $home_dir/versions
+		mkdir -p ${home_dir}/versions
 		chmod 700 $home_dir
 		chown -R zigbee2mqtt: $home_dir
 	fi
@@ -46,11 +51,9 @@ configure() {
 		chmod 700 $conf_dir
 		chown -R zigbee2mqtt: $conf_dir
 	fi
-
 	touch ${log_dir}/zigbee2mqtt.log
 	chown zigbee2mqtt: ${log_dir}/zigbee2mqtt.log
 
-	if [[ $live_ver != $last_ver ]]; then
 	if [[ $live_ver == '' ]]; then
 		echo Install Zigbee2MQTT
 	else
@@ -142,5 +145,4 @@ EOF
 		chown zigbee2mqtt: ${conf_dir}/configuration.yaml
 		eend
 	fi
-	fi
 }

scripts/homeassistant/step/4-hass-configurator.sh

@@ -16,16 +16,21 @@ configure() {
 	local live_ver="$(get_live_ver $live_dir)"
 	local conf_dir="/var/calculate/hass-configurator"
 
+	# отобразим наличие обновления и выйдем
 	if [[ $action == 'check' ]]; then
 		if [[ $live_ver != $last_ver ]]; then
 			einfo "hass-configurator: $last_ver update available, $live_ver installed"
-			eval $__result=1 # наличие обновления
+			eval $__result=1
 		fi
 		return 0
 	fi
 
+	# выйдем если нет обновления
+	[[ $live_ver == $last_ver ]] && return
+
+	# подготовим пути
 	if [[ ! -e $home_dir ]]; then
-		mkdir -p $home_dir/versions
+		mkdir -p ${home_dir}/versions
 		chmod 700 $home_dir
 		chown -R hass-configurator: $home_dir
 	fi
@@ -34,17 +39,16 @@ configure() {
 		chmod 700 $conf_dir
 		chown -R hass-configurator: $conf_dir
 	fi
-
 	touch ${log_dir}/hass-configurator.log
 	chown hass-configurator: ${log_dir}/hass-configurator.log
 
-	if [[ $live_ver != $last_ver ]]; then
 	if [[ $live_ver == '' ]]; then
 		echo Install HASS Configurator
 	else
 		echo Update Configurator
 	fi
 
+	# выполним настройки от пользователя hass-configurator
 	su - hass-configurator -s /bin/bash -c "$(cat <<- EOF
 		set -ueo pipefail
 		export PATH="/lib/rc/bin:$PATH"
@@ -116,7 +120,6 @@ EOF
 		chown hass-configurator: $conf_dir/settings.conf
 		eend
 	fi
-	fi
 
 }
 

scripts/homeassistant/step/5-config.sh

@@ -23,7 +23,7 @@ configure() {
 		set -ueo pipefail
 		export PATH="/lib/rc/bin:$PATH"
 
-		source ${work_dir}/.venv/bin/activate
+		source ${work_dir}/bin/activate
 
 		hass --config ${conf_dir} &>>${log_dir}/config.log &
 		id_hass=\$!