diff --git a/scripts/install b/scripts/install index 06d0bbc..2fb6bd2 100644 --- a/scripts/install +++ b/scripts/install @@ -116,17 +116,17 @@ ynh_mysql_setup_db $db_name $db_name db_user=$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" < ..config/install.sql -ynh_mysql_execute_as_root "$(cat ../conf/install.sql)" $db_name +#ynh_mysql_execute_as_root "$(cat ../conf/install.sql)" $db_name -#mysql -h localhost -P 3306 -u $db_name --password="$db_pwd" -e "SET GLOBAL event_scheduler = ON;" -ynh_mysql_execute_as_root $db_user $db_pwd <<< "SET GLOBAL event_scheduler = ON;" +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}'" -ynh_mysql_execute_as_root $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}'" +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}', '$db_user', '${email}', '${password}', 'en_US', ${time}, NULL, NULL, 1, 0, 1, 0, NULL) ON DUPLICATE KEY UPDATE password='${password}'" #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE