Fix scripts for instances which have been upgraded from Owncloud

scripts/backup

@@ -6,8 +6,8 @@ set -eu
 app=$YNH_APP_INSTANCE_NAME
 
 # Set app specific variables
-dbname=$app
-dbuser=$app
+dbname=`sudo cat /var/www/$app/config/config.php  |grep dbname|sed "s|.*=> '\(.*\)'.*|\1|g"`
+dbuser=$dbname
 
 # Source app helpers
 source /usr/share/yunohost/helpers

scripts/remove

@@ -5,8 +5,8 @@ source ./_common.sh
 
 # Set app specific variables
 app=$APPNAME
-dbname=$app
-dbuser=$app
+dbname=`sudo cat /var/www/$app/config/config.php  |grep dbname|sed "s|.*=> '\(.*\)'.*|\1|g"`
+dbuser=$dbname
 
 # Source app helpers
 source /usr/share/yunohost/helpers

scripts/restore

@@ -5,10 +5,6 @@ set -eu
 # Get multi-instances specific variables
 app=$YNH_APP_INSTANCE_NAME
 
-# Set app specific variables
-dbname=$app
-dbuser=$app
-
 # Source app helpers
 source /usr/share/yunohost/helpers
 
@@ -54,6 +50,10 @@ sudo cp -a ./www "$DESTDIR"
 sudo mkdir -p "$DATADIR"
 sudo cp -a ./data/. "$DATADIR"
 
+# Set app specific variables
+dbname=`sudo cat /var/www/$app/config/config.php  |grep dbname|sed "s|.*=> '\(.*\)'.*|\1|g"`
+dbuser=$dbname
+
 # Create and restore the database
 ynh_mysql_create_db "$dbname" "$dbuser" "$dbpass"
 ynh_mysql_connect_as "$dbuser" "$dbpass" "$dbname" < ./db.sql

scripts/upgrade

@@ -7,8 +7,8 @@ source ./_common.sh
 
 # Set app specific variables
 app=$APPNAME
-dbname=$app
-dbuser=$app
+dbname=`sudo cat /var/www/$app/config/config.php  |grep dbname|sed "s|.*=> '\(.*\)'.*|\1|g"`
+dbuser=$dbname
 
 # Source app helpers
 source /usr/share/yunohost/helpers