mirror of
https://github.com/YunoHost-Apps/freshrss_ynh.git
synced 2024-09-03 18:36:33 +02:00
[enh]refactor install finish cleaning
This commit is contained in:
parent
773a1ff7b0
commit
4b1ba962ec
3 changed files with 47 additions and 40 deletions
|
@ -4,5 +4,6 @@
|
|||
* [YunoHost website](https://yunohost.org)
|
||||
|
||||
Changelog:
|
||||
* Refactoring of yunohost scripts
|
||||
* Update to FreshRSS 1.4
|
||||
* Update to FreshRSS 1.2
|
||||
|
|
|
@ -12,7 +12,13 @@ then
|
|||
db_pwd=$(sudo yunohost app setting freshrss mysqlpwd)
|
||||
|
||||
#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"
|
||||
wallabagPath=$(sudo yunohost app setting wallabag path)
|
||||
wallabagUrl=$domain$wallabagPath
|
||||
|
@ -28,7 +34,8 @@ then
|
|||
#change username in sql
|
||||
sudo sed -i "s/YnoUser/$myuser/g" /tmp/$myuser-install.sql
|
||||
#create tables
|
||||
mysql -u $db_user -p$db_pwd $db_user < /tmp/$myuser-install.sql
|
||||
ynh_mysql_connect_as "$db_user" "$db_pwd" "$db_name" \
|
||||
< "/tmp/$myuser-install.sql"
|
||||
#remove temp sql
|
||||
sudo rm /tmp/$myuser-install.sql
|
||||
|
||||
|
|
|
@ -63,7 +63,6 @@ fi
|
|||
# Add users
|
||||
|
||||
#check wallabag
|
||||
#if [[ $(sudo yunohost app list --installed -f wallabag2 --json | grep -q '"installed": true') -eq 0 ]]; then
|
||||
if sudo yunohost app list --installed -f wallabag2 | grep -q id ; then
|
||||
echo "Detected wallabag V2"
|
||||
wallabagPath=$(sudo yunohost app setting wallabag2 path | sed 's#/*$##')
|
||||
|
|
Loading…
Reference in a new issue