From a5fc68edb2f32241cbefda0c8022da5124e08322 Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Fri, 4 Jan 2019 18:39:19 +0100
Subject: [PATCH] up

---
 scripts/install | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/scripts/install b/scripts/install
index d3354fb..e8b9d99 100644
--- a/scripts/install
+++ b/scripts/install
@@ -30,6 +30,8 @@ path_url=$YNH_APP_ARG_PATH
 is_public=$YNH_APP_ARG_IS_PUBLIC
 email=$YNH_APP_ARG_EMAIL
 password=$YNH_APP_ARG_PASSWORD
+uuid=$(cat /proc/sys/kernel/random/uuid)
+time=$(php -r 'echo time();')
 
 ### If it's a multi-instance app, meaning it can be installed several times independently
 ### The id of the app as stated in the manifest is available as $YNH_APP_ID
@@ -112,12 +114,15 @@ ynh_app_setting_set $app db_name $db_name
 ynh_mysql_setup_db $db_name $db_name
 
 echo "Creating pufferpanel account and installing database..."
-mysql -h localhost -P 3306 -u $db_name --password="$db_pwd" < ..config/install.sql
-mysql -h localhost -P 3306 -u $db_name --password="$db_pwd" -e "SET GLOBAL event_scheduler = ON;"
+#mysql -h localhost -P 3306 -u $db_name --password="$db_pwd" < ..config/install.sql
+ynh_mysql_connect_as $db_user $db_pwd $db_name < ..config/install.sql
+#mysql -h localhost -P 3306 -u $db_name --password="$db_pwd" -e "SET GLOBAL event_scheduler = ON;"
+ynh_mysql_connect_as $db_user $db_pwd  <<< "SET GLOBAL event_scheduler = ON;"
 
 echo "Installing user..."
-mysql -h localhost -P 3306 -D $db_name -u $db_name --password="$db_pwd" -e "
-INSERT INTO users VALUES (NULL, '${uuid}', '${username}', '${email}', '${password}', 'en_US', ${time}, NULL, NULL, 1, 0, 1, 0, NULL) ON DUPLICATE KEY UPDATE password='${password}'"
+#mysql -h localhost -P 3306 -D $db_name -u $db_name --password="$db_pwd" -e "
+#INSERT INTO users VALUES (NULL, '${uuid}', '${username}', '${email}', '${password}', 'en_US', ${time}, NULL, NULL, 1, 0, 1, 0, NULL) ON DUPLICATE KEY UPDATE password='${password}'"
+ynh_mysql_connect_as $db_user $db_pwd $db_name <<< "INSERT INTO users VALUES (NULL, '${uuid}', '${username}', '${email}', '${password}', 'en_US', ${time}, NULL, NULL, 1, 0, 1, 0, NULL) ON DUPLICATE KEY UPDATE password='${password}'"
 
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE