diff --git a/defaults.inc b/defaults.inc index 69359623..750c43fc 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -VERS='2.8.27-03132025' +VERS='2.8.27b-03132025' noheader=' update service dailytemp confsync -r -report test ' diff --git a/powerwall.sh b/powerwall.sh index c2f5024c..a89c8276 100755 --- a/powerwall.sh +++ b/powerwall.sh @@ -755,17 +755,18 @@ CONFSYNC(){ } UPDATE_TINYTUYA_SERVER(){ - TTS_FLDR=/opt/tinytuya-server - if [ ! -f /opt/raspiBackup.running ] && ([ -f ${NM_TMPFOLDER}/.singleserver.PW2.primary ] || [ -f ${NM_TMPFOLDER}/.singleserver.PWO2.primary ]); then - if [ -d ${TTS_FLDR}/devices.json ]; then - docker stop tinytuya-server - rm -Rf ${TTS_FLDR}/devices.json + if [ -f ${NM_TMPFOLDER}/.singleserver.PW2.primary ] || [ -f ${NM_TMPFOLDER}/.singleserver.PWO2.primary ]; then + TTS_FLDR=/opt/tinytuya-server + if [ ! -f /opt/raspiBackup.running ] && ([ -f ${NM_TMPFOLDER}/.singleserver.PW2.primary ] || [ -f ${NM_TMPFOLDER}/.singleserver.PWO2.primary ]); then + if [ -d ${TTS_FLDR}/devices.json ]; then + docker stop tinytuya-server + rm -Rf ${TTS_FLDR}/devices.json + fi + python3 -m tinytuya wizard -y -no-poll -credentials-file ${TTS_FLDR}/tinytuya.json -raw-response-file ${TTS_FLDR}/tuya-raw.json -device-file ${TTS_FLDR}/devices.json + sleep 1s + docker restart tinytuya-server fi - python3 -m tinytuya wizard -y -no-poll -credentials-file ${TTS_FLDR}/tinytuya.json -raw-response-file ${TTS_FLDR}/tuya-raw.json -device-file ${TTS_FLDR}/devices.json - sleep 1s - docker restart tinytuya-server fi - } DOWNLIST(){