From c02f0de04d77d34dde89506e7bafd880c26b1982 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Wed, 10 Apr 2019 00:34:37 +0200 Subject: [PATCH] swith to path_url --- scripts/install | 6 +++--- scripts/restore | 6 +++--- scripts/upgrade | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/install b/scripts/install index 7475218..4800ac3 100755 --- a/scripts/install +++ b/scripts/install @@ -22,7 +22,7 @@ ynh_abort_if_errors domain=$YNH_APP_ARG_DOMAIN -path="/Microsoft-Server-ActiveSync" +path_url="/Microsoft-Server-ActiveSync" app=$YNH_APP_INSTANCE_NAME #================================================= @@ -39,7 +39,7 @@ test ! -e "$statedir" || ynh_die "This path already contains a folder" final_logpath="/var/log/$app" # Register (book) web path -ynh_webpath_register $app $domain $path +ynh_webpath_register $app $domain $path_url #================================================= # STORE SETTINGS FROM MANIFEST @@ -47,7 +47,7 @@ ynh_webpath_register $app $domain $path ynh_print_info "Storing installation settings..." ynh_app_setting_set $app domain $domain -ynh_app_setting_set $app path $path +ynh_app_setting_set $app path $path_url ynh_app_setting_set $app statedir "$statedir" ynh_app_setting_set $app final_logpath "$final_logpath" diff --git a/scripts/restore b/scripts/restore index 8ed1da2..995817f 100755 --- a/scripts/restore +++ b/scripts/restore @@ -25,7 +25,7 @@ ynh_print_info "Loading settings..." app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get $app domain) -path=$(ynh_app_setting_get $app path) +path_url=$(ynh_app_setting_get $app path) final_path=$(ynh_app_setting_get $app final_path) statedir=$(ynh_app_setting_get $app statedir) final_logpath=$(ynh_app_setting_get $app final_logpath) @@ -35,8 +35,8 @@ final_logpath=$(ynh_app_setting_get $app final_logpath) #================================================= ynh_print_info "Validating restoration parameters..." -ynh_webpath_available $domain $path \ - || ynh_die "Path not available: ${domain}${path}" +ynh_webpath_available $domain $path_url \ + || ynh_die "Path not available: ${domain}${path_url}" test ! -d $final_path \ || ynh_die "There is already a directory: $final_path " diff --git a/scripts/upgrade b/scripts/upgrade index 3934b2e..f3c0a44 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -17,7 +17,7 @@ ynh_print_info "Loading installation settings..." app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get $app domain) -path=$(ynh_app_setting_get $app path) +path_url=$(ynh_app_setting_get $app path) final_path=$(ynh_app_setting_get $app final_path) statedir=$(ynh_app_setting_get $app statedir) final_logpath=$(ynh_app_setting_get $app final_logpath)