From b71687f5deeb3604238945a9b6dc277b97115f0e Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Thu, 17 Mar 2022 00:11:42 +0100
Subject: [PATCH] better helper

---
 scripts/_common.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index 3b96a8e..67d5a68 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -56,12 +56,12 @@ ynh_install_apps() {
         local oneargument=$(echo "$oneapp_and_its_args" | awk -F'?' '{print $2}')
         [ ! -z "$oneargument" ] && oneargument="--args \"$oneargument\""
 
-        if ! yunohost app list | grep -q "$oneapp"
+        # Installing or upgrading the app
+        yunohost tools update apps
+        if ! yunohost app list --output-as json --quiet | jq -e --arg id $oneapp '.apps[] | select(.id == $id)' >/dev/null
         then
-            yunohost tools update
             yunohost app install $oneapp $oneargument
         else
-            yunohost tools update
             yunohost app upgrade $oneapp $oneargument
         fi
         ynh_app_setting_set --app=$app --key=require_$oneapp --value="1"
@@ -97,7 +97,7 @@ ynh_remove_apps() {
         ynh_app_setting_delete --app=$app --key=require_$oneapp
 
         # List apps requiring $oneapp
-        local installed_apps=$(yunohost app list | grep -oP 'id: \K.*$')
+        local installed_apps=$(yunohost app list --output-as json --quiet | jq -r .apps[].id)
         local required_by=""
         local installed_app_required_by=""
         for installed_app in $installed_apps