beenull/webinoly
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

import db

Browse source 
Fixed successfull message even when error.
Also, missing mysql package check.
This commit is contained in:
Cristhian Martínez Ochoa 2024-02-23 11:44:05 -07:00
parent 8fb402d039
commit af49aaf3ae
2 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lib/webin
View file

@ -1081,6 +1081,7 @@ database_import() {
fi fi
check_external_db_saved check_external_db_saved
echo "${dim}Wait while we import your db... ${end}"
if [[ -n $external_db ]]; then if [[ -n $external_db ]]; then
external_db_parse external_db_parse
@ -1089,15 +1090,22 @@ database_import() {
exit 1 exit 1
fi fi
echo "${dim}Wait while we import your db... ${end}"
sudo mysql --defaults-group-suffix=_${extdb_url}:${extdb_port}_default --connect-timeout=10 -h "$extdb_url" -P "$extdb_port" < $file sudo mysql --defaults-group-suffix=_${extdb_url}:${extdb_port}_default --connect-timeout=10 -h "$extdb_url" -P "$extdb_port" < $file
sudo mysql --defaults-group-suffix=_${extdb_url}:${extdb_port}_default --connect-timeout=10 -h "$extdb_url" -P "$extdb_port" -e "FLUSH PRIVILEGES;" if [[ $? == "0" ]]; then
echo "${gre}Database successfully imported!${end}" sudo mysql --defaults-group-suffix=_${extdb_url}:${extdb_port}_default --connect-timeout=10 -h "$extdb_url" -P "$extdb_port" -e "FLUSH PRIVILEGES;"
echo "${gre}Database successfully imported!${end}"
else
echo "${red}[ERROR] An error occurred while we tried to import your database!${end}"
fi
elif [[ -z $external_db && $(check_mysql_connection localhost) == "true" ]]; then elif [[ -z $external_db && $(check_mysql_connection localhost) == "true" ]]; then
check_for_mysql -ask check_for_mysql -ask
sudo mysql -u admin < $file sudo mysql -u admin < $file
sudo mysql --connect-timeout=10 --user=admin -e "FLUSH PRIVILEGES;" if [[ $? == "0" ]]; then
echo "${gre}Database successfully imported!${end}" sudo mysql --connect-timeout=10 --user=admin -e "FLUSH PRIVILEGES;"
echo "${gre}Database successfully imported!${end}"
else
echo "${red}[ERROR] An error occurred while we tried to import your database!${end}"
fi
else else
echo "${red}[ERROR] A connection can not be established with MySQL/MariaDB localhost!${end}" echo "${red}[ERROR] A connection can not be established with MySQL/MariaDB localhost!${end}"
exit 1 exit 1

1
usr/webinoly
View file

@ -263,6 +263,7 @@ elif [[ -n $datadog ]]; then
elif [[ -n $db_import ]]; then elif [[ -n $db_import ]]; then
check_for_mysql
database_import database_import
nginx_not="true" # Nginx-Reload not-needed. nginx_not="true" # Nginx-Reload not-needed.