mirror of
https://github.com/YunoHost-Apps/freshrss_ynh.git
synced 2024-09-03 18:36:33 +02:00
[fix][WIP]Detect if wallabagV2 or wallabag is installed
This commit is contained in:
parent
98f3c6d768
commit
994faebfa1
1 changed files with 11 additions and 5 deletions
|
@ -63,12 +63,18 @@ fi
|
||||||
# Add users
|
# Add users
|
||||||
|
|
||||||
#check wallabag
|
#check wallabag
|
||||||
if [[ $(sudo yunohost app list -f wallabag | /bin/grep -q "installed: True") -eq 0 ]]; then
|
if [[ $(sudo yunohost app list --installed -f wallabag2) -eq 0 ]]; then
|
||||||
|
echo "Detected wallabag V2"
|
||||||
|
wallabagPath=$(sudo yunohost app setting wallabag2 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
|
||||||
|
elif [[ $(sudo yunohost app list --installed -f wallabag) -eq 0 ]]; then
|
||||||
echo "Detected wallabag"
|
echo "Detected wallabag"
|
||||||
wallabagPath=$(sudo yunohost app setting wallabag path)
|
wallabagPath=$(sudo yunohost app setting wallabag path)
|
||||||
wallabagUrl=$domain$wallabagPath
|
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),"
|
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
|
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)
|
freshrss_users=$(ldapsearch -h localhost -b ou=users,dc=yunohost,dc=org -x objectClass=mailAccount uid | grep uid: | sed 's/uid: //' | xargs)
|
||||||
|
|
Loading…
Reference in a new issue