1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/spip_ynh.git synced 2024-09-03 20:25:59 +02:00

Commenter la ligne qui pose problème sur Linter

This commit is contained in:
magikcypress 2017-03-09 16:47:17 +01:00
parent 9035ae1af3
commit e011326572

View file

@ -29,10 +29,10 @@ phpfpm_conf="/etc/php5/fpm/pool.d/${app}.conf"
[[ -f $phpfpm_conf ]] && ynh_die \ [[ -f $phpfpm_conf ]] && ynh_die \
"The PHP FPM configuration already exists at '${phpfpm_conf}'. "The PHP FPM configuration already exists at '${phpfpm_conf}'.
You should safely delete it before restoring this app." You should safely delete it before restoring this app."
phpfpm_ini="/etc/php5/fpm/conf.d/20-${app}.ini" # phpfpm_ini="/etc/php5/fpm/conf.d/20-${app}.ini"
[[ -f $phpfpm_ini ]] && ynh_die \ # [[ -f $phpfpm_ini ]] && ynh_die \
"The PHP FPM INI configuration already exists at '${phpfpm_ini}'. # "The PHP FPM INI configuration already exists at '${phpfpm_ini}'.
You should safely delete it before restoring this app." # You should safely delete it before restoring this app."
# Restore sources & data # Restore sources & data
final_path="/var/www/${app}" final_path="/var/www/${app}"
@ -48,8 +48,6 @@ if [[ $with_mysql -eq 1 ]]; then
ynh_mysql_create_db $db_user $db_user $db_pwd ynh_mysql_create_db $db_user $db_user $db_pwd
sudo su -c "mysql -u $db_user -p$db_pwd $app < ./db.sql" sudo su -c "mysql -u $db_user -p$db_pwd $app < ./db.sql"
sudo rm -f "./db.sql" sudo rm -f "./db.sql"
# sudo sed -i -e "s/'__DB_USER__', *'[^']*'/'__DB_USER__', '$app'/g" $final_path/config/connect.php
# sudo sed -i -e "s/'__DB_PWD__', *'[^']*'/'__DB_PWD__', '$app'/g" $final_path/config/connect.php
sudo sed -i "s@__DB_USER__@$db_user@g" $final_path/config/connect.php sudo sed -i "s@__DB_USER__@$db_user@g" $final_path/config/connect.php
sudo sed -i "s@__DB_PWD__@$db_pwd@g" $final_path/config/connect.php sudo sed -i "s@__DB_PWD__@$db_pwd@g" $final_path/config/connect.php
fi fi