diff --git a/scripts/backup b/scripts/backup index 7f100e9a..93127ce8 100644 --- a/scripts/backup +++ b/scripts/backup @@ -31,7 +31,7 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) domain=$(ynh_app_setting_get --app=$app --key=domain) db_name=$(ynh_app_setting_get --app=$app --key=db_name) phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) -database=$(ynh_app_setting_get --app=$app --key=final_database) +database=$(ynh_app_setting_get --app=$app --key=database) #================================================= # STANDARD BACKUP STEPS diff --git a/scripts/install b/scripts/install index 7185a5de..c56feb3c 100755 --- a/scripts/install +++ b/scripts/install @@ -189,12 +189,12 @@ ynh_replace_string --match_string="mysqlusername" --replace_string="$db_name" -- ynh_replace_string --match_string= "mysqldatabasename" --replace_string="$db_name" --target_file="$config" ynh_replace_string --match_string= "mysite.example" --replace_string="$domain" --target_file="$config" ynh_replace_string --match_string= "if the auto install failed, put a unique random string here" --replace_string="$random_string" --target_file="$config" -ynh_replace_string --match_string= "['admin_email'] = '';" --replace_string="['admin_email'] = '$email';" --target_file="$config" +sed -i "s/\['admin_email'\] = '';/\['admin_email'\] = '$email';/g" "$config" ynh_replace_string --match_string= "//error_reporting(E_ERROR | E_WARNING | E_PARSE );" --replace_string="error_reporting(E_ERROR | E_WARNING | E_PARSE );" --target_file="$config" ynh_replace_string --match_string= "//ini_set('error_log','php.out');" --replace_string="ini_set('error_log','php.log');" --target_file="$config" ynh_replace_string --match_string= "//ini_set('log_errors','1');" --replace_string="ini_set('log_errors','1');" --target_file="$config" ynh_replace_string --match_string= "//ini_set('display_errors', '0');" --replace_string="ini_set('display_errors', '0');" --target_file="$config" -ynh_replace_string --match_string= "['php_path'] = 'php';" --replace_string="['php_path'] = 'php$phpversion';" --target_file="$config" +sed -i "s/\['php_path'\] = 'php';/\['php_path'\] = 'php$phpversion';/g" "$config" # addon ldap config ynh_script_progression --message="Push Ldap configuration to .htconfig.php..." diff --git a/scripts/remove b/scripts/remove index 7069d21c..8a368955 100755 --- a/scripts/remove +++ b/scripts/remove @@ -20,7 +20,7 @@ domain=$(ynh_app_setting_get --app=$app --key=domain) db_name=$(ynh_app_setting_get --app=$app --key=db_name) db_user="$db_name" final_path=$(ynh_app_setting_get --app=$app --key=final_path) -database=$(ynh_app_setting_get --app=$app --key=final_database) +database=$(ynh_app_setting_get --app=$app --key=database) #================================================= diff --git a/scripts/restore b/scripts/restore index d293dd6c..65fc17bb 100644 --- a/scripts/restore +++ b/scripts/restore @@ -33,7 +33,7 @@ path_url=$(ynh_app_setting_get --app=$app --key=path) admin=$(ynh_app_setting_get --app=$app --key=admin) final_path=$(ynh_app_setting_get --app=$app --key=final_path) db_name=$(ynh_app_setting_get --app=$app --key=db_name) -database=$(ynh_app_setting_get --app=$app --key=final_database) +database=$(ynh_app_setting_get --app=$app --key=database) db_user=$db_name phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) diff --git a/scripts/upgrade b/scripts/upgrade index aa71fb55..88806148 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -22,7 +22,7 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) upload=$(ynh_app_setting_get --app=$app --key=upload) version=$(grep STD_VERSION $final_path/boot.php | cut -c 38- | rev | cut -c 5- | rev) last_update=$(grep update_time: /etc/yunohost/apps/$app/settings.yml | cut -c 14-) -database=$(ynh_app_setting_get --app=$app --key=final_database) +database=$(ynh_app_setting_get --app=$app --key=database) phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #=================================================