From 593892996f09b8c6e69a00631d7264366332a9e2 Mon Sep 17 00:00:00 2001
From: Giorgio Ravera <giorgio.ravera@gmail.com>
Date: Tue, 14 Jan 2020 22:03:53 +0100
Subject: [PATCH] Moved device tracker from nmap to ping and updated home
 assistant update

---
 .gitignore                                       |  8 +++-----
 automation/update_notifications.yaml             |  2 +-
 device_tracker/{nmap.yaml => nmap.yaml.disabled} |  0
 device_tracker/{ping.yaml.disabled => ping.yaml} |  0
 shell_command/homeassistant.yaml                 |  2 +-
 shell_scripts/homeassistant_upgrade.sh           | 13 ++++++++-----
 6 files changed, 13 insertions(+), 12 deletions(-)
 rename device_tracker/{nmap.yaml => nmap.yaml.disabled} (100%)
 rename device_tracker/{ping.yaml.disabled => ping.yaml} (100%)
 mode change 100644 => 100755 shell_scripts/homeassistant_upgrade.sh

diff --git a/.gitignore b/.gitignore
index a2fe8043..5a79d4e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,6 @@ deps/
 .google_maps_location_sharing.cookies.*
 .HA_VERSION
 bravia.conf
-home-assistant.log
 home-assistant_v2.db
 html5_push_registrations.conf
 .mercedesme-token-cache
@@ -12,6 +11,9 @@ secrets.yaml
 tts/
 .uuid
 
+# Log Files
+*.log
+
 # Disabled Files
 *.disabled
 
@@ -20,7 +22,3 @@ custom_components/
 themes/
 www/community
 git_repos/
-
-# Scripts
-fix_owner.sh
-upgrade.sh
diff --git a/automation/update_notifications.yaml b/automation/update_notifications.yaml
index 875d25c4..7476d173 100644
--- a/automation/update_notifications.yaml
+++ b/automation/update_notifications.yaml
@@ -52,5 +52,5 @@
     service: script.notify_text
     data_template:
       title: "HACS - Aggiornamento"
-      message: "Sono disponibili aggiornamenti per i dispositivi Shelly"
+      message: "Sono disponibili aggiornamenti per i moduli HACS"
       enable_persistant: true
diff --git a/device_tracker/nmap.yaml b/device_tracker/nmap.yaml.disabled
similarity index 100%
rename from device_tracker/nmap.yaml
rename to device_tracker/nmap.yaml.disabled
diff --git a/device_tracker/ping.yaml.disabled b/device_tracker/ping.yaml
similarity index 100%
rename from device_tracker/ping.yaml.disabled
rename to device_tracker/ping.yaml
diff --git a/shell_command/homeassistant.yaml b/shell_command/homeassistant.yaml
index c3511e31..f665123a 100644
--- a/shell_command/homeassistant.yaml
+++ b/shell_command/homeassistant.yaml
@@ -1 +1 @@
-homeassistant_upgrade: 'bash /config/homeassistant_upgrade.sh'
+homeassistant_upgrade: 'bash /config/shell_scripts/homeassistant_upgrade.sh'
diff --git a/shell_scripts/homeassistant_upgrade.sh b/shell_scripts/homeassistant_upgrade.sh
old mode 100644
new mode 100755
index 9e431f26..70ed341b
--- a/shell_scripts/homeassistant_upgrade.sh
+++ b/shell_scripts/homeassistant_upgrade.sh
@@ -1,9 +1,12 @@
 #!/bin/bash
 
+HASS_HOME="/config"
+LOG_FILE="$HASS_HOME/home-assistant_upgrade.log"
+
 echo "Changed directory to homeassistant home"
-cd
-echo "Activating python environment"
-source bin/activate
-echo "Upgrading homeassistant"
-pip3 install --upgrade homeassistant 2>&1 | tee /var/log/homeassistant/upgrade.log
+cd $HASS_HOME
+#echo "Activating python environment"
+#source bin/activate
+echo "Starting upgrading homeassistant"
+pip3 install --upgrade homeassistant 2>&1 | tee $LOG_FILE
 echo "Done"
-- 
2.47.3