From 3919a3f603d4aaabf714a728d71b17706c3f7e1e Mon Sep 17 00:00:00 2001 From: polytan02 Date: Wed, 18 Jan 2017 11:32:48 +0000 Subject: [PATCH] Test if baikal is present Same as agendav --- scripts/install | 3 +-- scripts/upgrade | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/scripts/install b/scripts/install index 64a9171..9c93c3f 100644 --- a/scripts/install +++ b/scripts/install @@ -104,8 +104,7 @@ sed -i "s@ALIASTOCHANGE@$final_path@g" ../conf/config.php sed -i "s@LOGTOCHANGE@$final_logpath@g" ../conf/config.php # Enable caldav carddav support -sudo yunohost app list -f baikal --json | grep '"installed": true' -if [ "$?" -eq 0 ]; then +if sudo yunohost app list --installed -f baikal | grep -q id ; then echo "Detected Baikal" caldavdomain=$(sudo yunohost app setting baikal domain) caldavpath=$(sudo yunohost app setting baikal path) diff --git a/scripts/upgrade b/scripts/upgrade index 7abb11f..402dcff 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -65,8 +65,7 @@ sed -i "s@ALIASTOCHANGE@$final_path@g" ../conf/config.php sed -i "s@LOGTOCHANGE@$final_logpath@g" ../conf/config.php # Enable caldav carddav support -sudo yunohost app list -f baikal --json | grep '"installed": true' -if [ "$?" -eq 0 ]; then +if sudo yunohost app list --installed -f baikal | grep -q id ; then echo "Detected Baikal" caldavdomain=$(sudo yunohost app setting baikal domain) caldavpath=$(sudo yunohost app setting baikal path)