From 635f4ba24ee140ad7037c2f496d7e4422e98d39c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment?= Date: Sun, 4 Sep 2016 12:57:20 +0200 Subject: [PATCH] [fix][WIP]fix wallabag detection --- scripts/install | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/scripts/install b/scripts/install index 29d7aec..5b68db8 100755 --- a/scripts/install +++ b/scripts/install @@ -63,18 +63,22 @@ fi # Add users #check wallabag -if [[ $(sudo yunohost app list --installed -f wallabag2 | grep -q 'installed: True') -eq 0 ]]; then +sudo yunohost app list --installed -f wallabag2 --json | grep -q '"installed": true' +if [[ "$?" -eq 0 ]]; then echo "Detected wallabag V2" wallabagPath=$(sudo yunohost app setting wallabag2 path | sed 's#/*$##') wallabagUrl=$domain$wallabagPath sharingWallabag="'sharing' => \n\tarray( \n\t\t0 => \n\t\tarray(\n\t\t\t'type' => 'wallabagv2',\n\t\t\t'name' => 'Wallabag',\n\t\t\t'url' => 'https://$wallabagUrl',\n\t\t)," sharingEnable=1 -elif [[ $(sudo yunohost app list --installed -f wallabag | grep -q 'installed: True') -eq 0 ]]; then - echo "Detected wallabag" - wallabagPath=$(sudo yunohost app setting wallabag path) - wallabagUrl=$domain$wallabagPath - sharingWallabag="'sharing' => \n\tarray( \n\t\t0 => \n\t\tarray(\n\t\t\t'type' => 'wallabag',\n\t\t\t'name' => 'Wallabag',\n\t\t\t'url' => 'https://$wallabagUrl',\n\t\t)," - sharingEnable=1 +else + sudo yunohost app list --installed -f wallabag --json | grep -q '"installed": true' + if [[ "$?" -eq 0 ]]; then + echo "Detected wallabag" + wallabagPath=$(sudo yunohost app setting wallabag path) + wallabagUrl=$domain$wallabagPath + sharingWallabag="'sharing' => \n\tarray( \n\t\t0 => \n\t\tarray(\n\t\t\t'type' => 'wallabag',\n\t\t\t'name' => 'Wallabag',\n\t\t\t'url' => 'https://$wallabagUrl',\n\t\t)," + sharingEnable=1 + fi fi freshrss_users=$(ldapsearch -h localhost -b ou=users,dc=yunohost,dc=org -x objectClass=mailAccount uid | grep uid: | sed 's/uid: //' | xargs)