v4.0.0 upgrade script

setup.sh

@@ -340,9 +340,9 @@ if [ -f weather/weather411.conf ]; then
 fi
 
 # Display Final Instructions
-if [ "${config}" == "Tesla Cloud" ]
+if ! grep -qE "^PW_HOST=.+" "${PW_ENV_FILE}"
 then
-    DASHBOARD="'dashboard-solar-only.json' or 'dashboard-no-animation.json'"
+    DASHBOARD="'dashboard.json' or 'dashboard-solar-only.json'"
 else
     DASHBOARD="'dashboard.json'"
 fi

upgrade.sh

@@ -11,7 +11,6 @@ INFLUXDB_ENV_FILE="influxdb.env"
 TELEGRAF_LOCAL="telegraf.local"
 PW_ENV_FILE="pypowerwall.env"
 GF_ENV_FILE="grafana.env"
-PROFILE="none"
 if [ -f VERSION ]; then
     CURRENT=`cat VERSION`
 fi
@@ -41,44 +40,6 @@ running() {
     [[ $status == ${code} ]]
 }
 
-# Compose Profiles Helper Functions
-get_profile() {
-    if [ ! -f ${COMPOSE_ENV_FILE} ]; then
-        return 1
-    else
-        unset COMPOSE_PROFILES
-        . "${COMPOSE_ENV_FILE}"
-    fi
-    # Check COMPOSE_PROFILES for profile
-    IFS=',' read -ra PROFILES <<< "${COMPOSE_PROFILES}"
-    for p in "${PROFILES[@]}"; do
-        if [ "${p}" == "${1}" ]; then
-            return 0
-        fi
-    done
-    return 1
-}
-
-add_profile() {
-    # Create default docker compose env file if needed.
-    if [ ! -f ${COMPOSE_ENV_FILE} ]; then
-        cp "${COMPOSE_ENV_FILE}.sample" "${COMPOSE_ENV_FILE}"
-    fi
-    if ! get_profile "${1}"; then
-        # Add profile to COMPOSE_PROFILES and save to env file
-        PROFILES+=("${1}")
-        if [ -z "${COMPOSE_PROFILES}" ]; then
-            if grep -q "^#COMPOSE_PROFILES=" "${COMPOSE_ENV_FILE}"; then
-                sed -i.bak "s@^#COMPOSE_PROFILES=.*@COMPOSE_PROFILES=$(IFS=,; echo "${PROFILES[*]}")@g" "${COMPOSE_ENV_FILE}"
-            else
-                echo -e "\nCOMPOSE_PROFILES=$(IFS=,; echo "${PROFILES[*]}")" >> "${COMPOSE_ENV_FILE}"
-            fi
-        else
-            sed -i.bak "s@^COMPOSE_PROFILES=.*@COMPOSE_PROFILES=$(IFS=,; echo "${PROFILES[*]}")@g" "${COMPOSE_ENV_FILE}"
-        fi
-    fi
-}
-
 # Because this file can be upgraded, don't use it to run the upgrade
 if [ "$0" != "tmp.sh" ]; then
     # Grab latest upgrade script from GitHub and run it
@@ -98,18 +59,13 @@ echo "This script will attempt to upgrade you to the latest version without"
 echo "removing existing data. A backup is still recommended."
 echo ""
 
-# Check for existing solar-only installation
+# Check for existing beta solar-only installation or solar-only profile
 if [ -f tools/solar-only/compose.env ] && [ ! -f ${COMPOSE_ENV_FILE} ]; then
     echo "NOTE: Your existing 'solar-only' installation will be migrated to:"
     echo "      ${PWD}"
     echo ""
     PROFILE="solar-only"
-fi
-
-# Check COMPOSE_PROFILES for existing configuration profile
-if get_profile "default"; then
-    PROFILE="default"
-elif get_profile "solar-only"; then
+elif [ -f ${COMPOSE_ENV_FILE} ] && grep -q "^COMPOSE_PROFILES=.*solar-only" "${COMPOSE_ENV_FILE}"; then
     PROFILE="solar-only"
 fi
 
@@ -136,7 +92,7 @@ else
     exit
 fi
 
-# Migrate existing solar-only installation if found
+# Migrate existing beta solar-only installation if found
 if [ -f tools/solar-only/compose.env ] && [ ! -f ${COMPOSE_ENV_FILE} ]; then
     cd tools/solar-only
 
@@ -183,14 +139,32 @@ if [ -f tools/solar-only/compose.env ] && [ ! -f ${COMPOSE_ENV_FILE} ]; then
     fi
     rm -rf tz tesla-history weather dashboard.json.bak
     cd ../..
+    echo ""
+fi
 
-    # Add solar-only and weather411 (if configured) to COMPOSE_PROFILES
-    PROFILE="solar-only"
-    add_profile "solar-only"
-    if [ -f weather/weather411.conf ]; then
-        add_profile "weather411"
+# Migrate solar-only profile to pypowerwall cloud mode
+if [ "${PROFILE}" == "solar-only" ]; then
+    # Create Powerwall Settings
+    rm -f ${PW_ENV_FILE}
+    mkdir -p .auth
+    cp tools/tesla-history/tesla-history.auth .auth/.pypowerwall.auth
+    if grep -qE "^SITE = [0-9].+" tools/tesla-history/tesla-history.conf; then
+        grep -E "^SITE = [0-9].+" tools/tesla-history/tesla-history.conf | awk '{ print $NF }' > .auth/.pypowerwall.site
     fi
-    echo ""
+    EMAIL=$(grep -E "^USER = .+@.+" tools/tesla-history/tesla-history.conf | awk '{ print $NF }')
+    echo "PW_EMAIL=${EMAIL}" > ${PW_ENV_FILE}
+    echo "PW_PASSWORD=${PASSWORD}" >> ${PW_ENV_FILE}
+    echo "PW_HOST=${IP}" >> ${PW_ENV_FILE}
+    echo "PW_TIMEZONE=America/Los_Angeles" >> ${PW_ENV_FILE}
+    echo "TZ=America/Los_Angeles" >> ${PW_ENV_FILE}
+    echo "PW_DEBUG=no" >> ${PW_ENV_FILE}
+    echo "PW_STYLE=grafana-dark" >> ${PW_ENV_FILE}
+fi
+
+# Remove use of COMPOSE_PROFILES (deprecated as of 4.0.0)
+if [ -f ${COMPOSE_ENV_FILE} ] && grep -qE "^COMPOSE_PROFILES=.*(default|solar-only)" "${COMPOSE_ENV_FILE}"; then
+    ./compose-dash.sh down
+    sed -i.bak "s@^COMPOSE_PROFILES=.*@# *** Deprecated as of 4.0.0 ***\n#&@g" "${COMPOSE_ENV_FILE}"
 fi
 
 # Remember Timezone and Reset to Default
@@ -247,40 +221,23 @@ else
     fi
 fi
 
-# Check for COMPOSE_PROFILES and add if missing (required in 3.0.0)
-if get_profile "default"; then
-    PROFILE="default"
-elif get_profile "solar-only"; then
-    PROFILE="solar-only"
-else
-    # Missing - Add default and weather411 (if configured) to COMPOSE_PROFILES
-    PROFILE="default"
-    add_profile "default"
-    if [ -f weather/weather411.conf ]; then
-        add_profile "weather411"
-    fi
+# Create default telegraf local file if needed.
+if [ ! -f ${TELEGRAF_LOCAL} ]; then
+    cp "${TELEGRAF_LOCAL}.sample" "${TELEGRAF_LOCAL}"
 fi
 
-if [ "${PROFILE}" == "default" ]
-then
-    # Create default telegraf local file if needed.
-    if [ ! -f ${TELEGRAF_LOCAL} ]; then
-        cp "${TELEGRAF_LOCAL}.sample" "${TELEGRAF_LOCAL}"
-    fi
-
-    # Check for PW_STYLE setting and add if missing
-    if ! grep -q "PW_STYLE" ${PW_ENV_FILE}; then
-        echo "Your pypowerwall environmental settings are missing PW_STYLE."
-        echo "Adding..."
-        echo "PW_STYLE=grafana-dark" >> ${PW_ENV_FILE}
-    fi
+# Check for PW_STYLE setting and add if missing
+if ! grep -q "PW_STYLE" ${PW_ENV_FILE}; then
+    echo "Your pypowerwall environmental settings are missing PW_STYLE."
+    echo "Adding..."
+    echo "PW_STYLE=grafana-dark" >> ${PW_ENV_FILE}
+fi
 
-    # Check to see that TZ is set in pypowerwall
-    if ! grep -q "TZ=" ${PW_ENV_FILE}; then
-        echo "Your pypowerwall environmental settings are missing TZ."
-        echo "Adding..."
-        echo "TZ=America/Los_Angeles" >> ${PW_ENV_FILE}
-    fi
+# Check to see that TZ is set in pypowerwall
+if ! grep -q "TZ=" ${PW_ENV_FILE}; then
+    echo "Your pypowerwall environmental settings are missing TZ."
+    echo "Adding..."
+    echo "TZ=America/Los_Angeles" >> ${PW_ENV_FILE}
 fi
 
 # Check to see if Weather Data is Available
@@ -366,9 +323,9 @@ echo "Restarting Powerwall-Dashboard stack..."
 ./compose-dash.sh up -d
 
 # Display Final Instructions
-if [ "${PROFILE}" == "solar-only" ]
+if ! grep -qE "^PW_HOST=.+" "${PW_ENV_FILE}"
 then
-    DASHBOARD="'dashboard-solar-only.json' or 'dashboard-no-animation.json'"
+    DASHBOARD="'dashboard.json' or 'dashboard-solar-only.json'"
 else
     DASHBOARD="'dashboard.json'"
 fi