mirror of
https://github.com/YunoHost-Apps/sogo_ynh.git
synced 2024-09-03 20:26:07 +02:00
Fix more linter
This commit is contained in:
parent
eebce77031
commit
287b9b0d56
3 changed files with 3 additions and 9 deletions
|
@ -19,12 +19,11 @@ ynh_script_progression --message="Loading installation settings..."
|
||||||
# RETRIEVE ARGUMENTS
|
# RETRIEVE ARGUMENTS
|
||||||
old_domain=$YNH_APP_OLD_DOMAIN
|
old_domain=$YNH_APP_OLD_DOMAIN
|
||||||
domain=$YNH_APP_NEW_DOMAIN
|
domain=$YNH_APP_NEW_DOMAIN
|
||||||
path_url=$(ynh_normalize_url_path --path_url $YNH_APP_NEW_PATH)
|
path_url=$YNH_APP_NEW_PATH
|
||||||
app=$YNH_APP_INSTANCE_NAME
|
app=$YNH_APP_INSTANCE_NAME
|
||||||
|
|
||||||
port=$(ynh_app_setting_get --app $app --key web_port)
|
port=$(ynh_app_setting_get --app $app --key web_port)
|
||||||
admin=$(ynh_app_setting_get --app $app --key admin)
|
admin=$(ynh_app_setting_get --app $app --key admin)
|
||||||
final_path=$(ynh_app_setting_get --app $app --key final_path)
|
|
||||||
|
|
||||||
# Check if the new path stay /SOGo if not exit
|
# Check if the new path stay /SOGo if not exit
|
||||||
|
|
||||||
|
|
|
@ -18,12 +18,8 @@ ynh_script_progression --message="Loading settings..."
|
||||||
|
|
||||||
domain=$(ynh_app_setting_get --app $app --key domain)
|
domain=$(ynh_app_setting_get --app $app --key domain)
|
||||||
path_url=$(ynh_app_setting_get --app $app --key path)
|
path_url=$(ynh_app_setting_get --app $app --key path)
|
||||||
final_path=$(ynh_app_setting_get --app $app --key final_path)
|
|
||||||
db_name=$(ynh_app_setting_get --app $app --key db_name)
|
db_name=$(ynh_app_setting_get --app $app --key db_name)
|
||||||
|
db_user=$db_name
|
||||||
# CHECK IF THE APP CAN BE RESTORED
|
|
||||||
ynh_webpath_available --domain $domain --path_url $path_url \
|
|
||||||
|| ynh_die --message "Path not available: ${domain}${path_url}"
|
|
||||||
|
|
||||||
#=================================================
|
#=================================================
|
||||||
# STANDARD RESTORATION STEPS
|
# STANDARD RESTORATION STEPS
|
||||||
|
@ -39,7 +35,6 @@ ynh_restore
|
||||||
|
|
||||||
# RESTORE THE MYSQL DATABASE
|
# RESTORE THE MYSQL DATABASE
|
||||||
ynh_script_progression --message="Restoring database..." --weight=3
|
ynh_script_progression --message="Restoring database..." --weight=3
|
||||||
db_user=$db_name
|
|
||||||
db_pwd=$(ynh_app_setting_get --app $app --key mysqlpwd)
|
db_pwd=$(ynh_app_setting_get --app $app --key mysqlpwd)
|
||||||
ynh_mysql_setup_db --db_name $db_name --db_user $db_user --db_pwd $db_pwd
|
ynh_mysql_setup_db --db_name $db_name --db_user $db_user --db_pwd $db_pwd
|
||||||
ynh_mysql_connect_as --user $db_user --password $db_pwd --database $db_name < ./db.sql
|
ynh_mysql_connect_as --user $db_user --password $db_pwd --database $db_name < ./db.sql
|
||||||
|
|
|
@ -23,7 +23,7 @@ admin=$(ynh_app_setting_get --app $app --key admin)
|
||||||
port=$(ynh_app_setting_get --app $app --key web_port)
|
port=$(ynh_app_setting_get --app $app --key web_port)
|
||||||
smtp_port=$(ynh_app_setting_get --app $app --key smtp_port)
|
smtp_port=$(ynh_app_setting_get --app $app --key smtp_port)
|
||||||
db_name=$(ynh_app_setting_get --app $app --key db_name)
|
db_name=$(ynh_app_setting_get --app $app --key db_name)
|
||||||
db_user=$(ynh_app_setting_get --app $app --key db_user)
|
db_user=$db_name
|
||||||
db_pwd=$(ynh_app_setting_get --app $app --key mysqlpwd)
|
db_pwd=$(ynh_app_setting_get --app $app --key mysqlpwd)
|
||||||
|
|
||||||
# Backup the current version of the app
|
# Backup the current version of the app
|
||||||
|
|
Loading…
Add table
Reference in a new issue