diff --git a/scripts/install b/scripts/install index 30a17b5..b35e6bd 100644 --- a/scripts/install +++ b/scripts/install @@ -24,23 +24,23 @@ ynh_abort_if_errors # RETRIEVE ARGUMENTS FROM THE MANIFEST #================================================= -export domain=$YNH_APP_ARG_DOMAIN -export path_url=/ -export admin=$YNH_APP_ARG_ADMIN -export email=$YNH_APP_ARG_EMAIL -export isp_name=$YNH_APP_ARG_ISP_NAME -export isp_site=$YNH_APP_ARG_ISP_SITE +domain=$YNH_APP_ARG_DOMAIN +path_url=/ +admin=$YNH_APP_ARG_ADMIN +email=$YNH_APP_ARG_EMAIL +isp_name=$YNH_APP_ARG_ISP_NAME +isp_site=$YNH_APP_ARG_ISP_SITE is_public=1 -export secret=$(ynh_string_random 24) +secret=$(ynh_string_random 24) -export app=$YNH_APP_INSTANCE_NAME +app=$YNH_APP_INSTANCE_NAME #================================================= # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS #================================================= ynh_script_progression --message="Validating installation parameters..." --weight=1 -export final_path=/opt/$app +final_path=/opt/$app test ! -e "$final_path" || ynh_die --message="This path already contains a folder" # Register (book) web path @@ -81,12 +81,12 @@ ynh_system_user_create --username=$app #================================================= ynh_script_progression --message="Creating a PostgreSQL database..." --weight=1 -export db_name=$(ynh_sanitize_dbid --db_name=$app) -export db_user=$db_name +db_name=$(ynh_sanitize_dbid --db_name=$app) +db_user=$db_name ynh_app_setting_set --app=$app --key=db_name --value=$db_name ynh_psql_test_if_first_run ynh_psql_setup_db --db_user=$db_user --db_name=$db_name -export db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd) +db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd) #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE @@ -129,7 +129,7 @@ popd #================================================= ynh_script_progression --message="Configuring application..." --weight=1 -export prefix="${path_url#"/"}/" +prefix="${path_url#"/"}/" prefix=${prefix%"/"} ynh_render_template ../conf/local.py.j2 "$final_path/coin/settings_local.py" ynh_store_file_checksum --file="$final_path/coin/settings_local.py" diff --git a/scripts/restore b/scripts/restore index 51e23ee..83ace85 100644 --- a/scripts/restore +++ b/scripts/restore @@ -26,18 +26,18 @@ ynh_abort_if_errors #================================================= ynh_script_progression --message="Loading installation settings..." --weight=1 -export app=$YNH_APP_INSTANCE_NAME +app=$YNH_APP_INSTANCE_NAME -export domain=$(ynh_app_setting_get --app=$app --key=domain) -export path_url=$(ynh_app_setting_get --app=$app --key=path) -export final_path=$(ynh_app_setting_get --app=$app --key=final_path) -export db_name=$(ynh_app_setting_get --app=$app --key=db_name) -export db_user=$db_name -export admin=$(ynh_app_setting_get --app=$app --key=admin) -export email=$(ynh_app_setting_get --app=$app --key=email) -export isp_name=$(ynh_app_setting_get --app=$app --key=isp_name) -export isp_site=$(ynh_app_setting_get --app=$app --key=isp_site) -export secret=$(ynh_app_setting_get --app=$app --key=secret) +domain=$(ynh_app_setting_get --app=$app --key=domain) +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_user=$db_name +admin=$(ynh_app_setting_get --app=$app --key=admin) +email=$(ynh_app_setting_get --app=$app --key=email) +isp_name=$(ynh_app_setting_get --app=$app --key=isp_name) +isp_site=$(ynh_app_setting_get --app=$app --key=isp_site) +secret=$(ynh_app_setting_get --app=$app --key=secret) #================================================= # CHECK IF THE APP CAN BE RESTORED @@ -91,7 +91,7 @@ ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" #================================================= ynh_script_progression --message="Restoring the PostgreSQL database..." --weight=1 -export db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd) +db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd) ynh_psql_test_if_first_run ynh_psql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$db_pwd ynh_psql_execute_file_as_root --file="./db.sql" --database=$db_name diff --git a/scripts/upgrade b/scripts/upgrade index 16045d0..87dc452 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -15,19 +15,19 @@ source /usr/share/yunohost/helpers #================================================= ynh_script_progression --message="Loading installation settings..." --weight=1 -export app=$YNH_APP_INSTANCE_NAME +app=$YNH_APP_INSTANCE_NAME -export domain=$(ynh_app_setting_get --app=$app --key=domain) -export path_url=$(ynh_app_setting_get --app=$app --key=path) -export admin=$(ynh_app_setting_get --app=$app --key=admin) -export email=$(ynh_app_setting_get --app=$app --key=email) -export isp_name=$(ynh_app_setting_get --app=$app --key=isp_name) -export isp_site=$(ynh_app_setting_get --app=$app --key=isp_site) -export secret=$(ynh_app_setting_get --app=$app --key=secret) -export final_path=$(ynh_app_setting_get --app=$app --key=final_path) -export db_name=$(ynh_app_setting_get --app=$app --key=db_name) -export db_user=$db_name -export db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd) +domain=$(ynh_app_setting_get --app=$app --key=domain) +path_url=$(ynh_app_setting_get --app=$app --key=path) +admin=$(ynh_app_setting_get --app=$app --key=admin) +email=$(ynh_app_setting_get --app=$app --key=email) +isp_name=$(ynh_app_setting_get --app=$app --key=isp_name) +isp_site=$(ynh_app_setting_get --app=$app --key=isp_site) +secret=$(ynh_app_setting_get --app=$app --key=secret) +final_path=$(ynh_app_setting_get --app=$app --key=final_path) +db_name=$(ynh_app_setting_get --app=$app --key=db_name) +db_user=$db_name +db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd) #================================================= # CHECK VERSION @@ -132,7 +132,7 @@ ynh_add_nginx_config #================================================= ynh_script_progression --message="Configuring Django..." --weight=1 -export prefix="${path_url#"/"}/" +prefix="${path_url#"/"}/" prefix=${prefix%"/"} ynh_backup_if_checksum_is_different --file="$final_path/coin/settings_local.py" ynh_render_template ../conf/local.py.j2 "$final_path/coin/setings_local.py"