From 1fe41e5570ec4306f1bae8d5a318c46ff292e246 Mon Sep 17 00:00:00 2001
From: Kay0u <pierre@kayou.io>
Date: Thu, 31 Dec 2020 00:59:45 +0100
Subject: [PATCH] Fix detection of mail app enabled

---
 scripts/upgrade | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 9e77108..e2d1b8c 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -245,7 +245,8 @@ then
     exec_occ -V
 
     # Upgrade may fail if this app is enabled
-    exec_occ app:list | grep -q -w mail
+    # Take all apps enabled, and check if mail is one of them
+    exec_occ app:list | awk '/Enabled/{f=1;next} /Disabled/{f=0} f' | grep -q -w mail
     mail_app_is_active=$?
     
     # Temporary disable the mail app