diff --git a/scripts/install b/scripts/install index d5d7d06..828d439 100644 --- a/scripts/install +++ b/scripts/install @@ -118,15 +118,18 @@ db_user=$db_name echo "Creating pufferpanel account and installing database..." #mysql -D $db_name -h localhost -P 3306 -u $db_name --password="$db_pwd" < ../conf/install.sql #ynh_mysql_execute_as_root -D $db_name <<< "flush privileges;" -ynh_mysql_execute_as_root "$(cat ../conf/install.sql)" $db_name +ynh_mysql_execute_file_as_root ../conf/install.sql $db_name #mysql -D $db_name -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;" +#ynh_mysql_connect_as $db_user $db_pwd <<< "SET GLOBAL event_scheduler = ON;" +ynh_mysql_execute_as_root <<< "SET GLOBAL event_scheduler = ON;" $db_name echo "Installing user..." #mysql -D $db_name -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}', '$db_user', '${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 <<< "INSERT INTO users VALUES (NULL, '${uuid}', '$db_user', '${email}', '${password}', 'en_US', ${time}, NULL, NULL, 1, 0, 1, 0, NULL) ON DUPLICATE KEY UPDATE password='${password}'" +ynh_mysql_execute_as_root <<< "INSERT INTO users VALUES (NULL, '${uuid}', '$db_user', '${email}', '${password}', 'en_US', ${time}, NULL, NULL, 1, 0, 1, 0, NULL) ON DUPLICATE KEY UPDATE password='${password}'" $db_name + #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE