Fix issues with diversion removal on install/upgrade (#159)

home-assistant · Oct 27, 2021 · ab687fd · ab687fd
1 parent a13eda0
commit ab687fd
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/homeassistant-supervised/DEBIAN/control b/homeassistant-supervised/DEBIAN/control
@@ -1,6 +1,6 @@
 Package: homeassistant-supervised
 Section: base
-Version: 1.0.0
+Version: 1.0.1
 Priority: optional
 Architecture: all
 Depends: curl, bash, docker-ce, dbus, network-manager, apparmor, jq, systemd, os-agent

diff --git a/homeassistant-supervised/DEBIAN/postrm b/homeassistant-supervised/DEBIAN/postrm
@@ -4,15 +4,25 @@ function info { echo -e "\e[32m[info] $*\e[39m"; }
 function warn  { echo -e "\e[33m[warn] $*\e[39m"; }
 function error { echo -e "\e[31m[error] $*\e[39m"; exit 1; }
 
+
 # Undo diversions
-dpkg-divert --package homeassistant-supervised --remove --rename \
+function undo_divert () {
+  dpkg-divert --package homeassistant-supervised --remove --rename \
     --divert /etc/NetworkManager/NetworkManager.conf.real /etc/NetworkManager/NetworkManager.conf
 
-dpkg-divert --package homeassistant-supervised --remove --rename \
+  dpkg-divert --package homeassistant-supervised --remove --rename \
     --divert /etc/NetworkManager/system-connections/default.real /etc/NetworkManager/system-connections/default
 
-dpkg-divert --package homeassistant-supervised --remove --rename \
+  dpkg-divert --package homeassistant-supervised --remove --rename \
     --divert /etc/docker/daemon.json.real /etc/docker/daemon.json
 
-dpkg-divert --package homeassistant-supervised --remove --rename \
-    --divert /etc/network/interfaces.real /etc/network/interfaces
+  dpkg-divert --package homeassistant-supervised --remove --rename \
+    --divert /etc/network/interfaces.real /etc/network/interfaces
+}
+
+case "$1" in
+remove|abort-install|disappear)
+	  info Undo divert on "$@"
+          undo_divert
+        ;;
+esac