1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/z-push_ynh.git synced 2024-09-03 18:05:58 +02:00

Merge pull request #9 from yalh76/path_url

swith to path_url
This commit is contained in:
yalh76 2019-04-10 01:06:28 +02:00 committed by GitHub
commit d8664b9ea6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 7 deletions

View file

@ -22,7 +22,7 @@ ynh_abort_if_errors
domain=$YNH_APP_ARG_DOMAIN domain=$YNH_APP_ARG_DOMAIN
path="/Microsoft-Server-ActiveSync" path_url="/Microsoft-Server-ActiveSync"
app=$YNH_APP_INSTANCE_NAME 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" final_logpath="/var/log/$app"
# Register (book) web path # Register (book) web path
ynh_webpath_register $app $domain $path ynh_webpath_register $app $domain $path_url
#================================================= #=================================================
# STORE SETTINGS FROM MANIFEST # STORE SETTINGS FROM MANIFEST
@ -47,7 +47,7 @@ ynh_webpath_register $app $domain $path
ynh_print_info "Storing installation settings..." ynh_print_info "Storing installation settings..."
ynh_app_setting_set $app domain $domain 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 statedir "$statedir"
ynh_app_setting_set $app final_logpath "$final_logpath" ynh_app_setting_set $app final_logpath "$final_logpath"

View file

@ -25,7 +25,7 @@ ynh_print_info "Loading settings..."
app=$YNH_APP_INSTANCE_NAME app=$YNH_APP_INSTANCE_NAME
domain=$(ynh_app_setting_get $app domain) 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) final_path=$(ynh_app_setting_get $app final_path)
statedir=$(ynh_app_setting_get $app statedir) statedir=$(ynh_app_setting_get $app statedir)
final_logpath=$(ynh_app_setting_get $app final_logpath) 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_print_info "Validating restoration parameters..."
ynh_webpath_available $domain $path \ ynh_webpath_available $domain $path_url \
|| ynh_die "Path not available: ${domain}${path}" || ynh_die "Path not available: ${domain}${path_url}"
test ! -d $final_path \ test ! -d $final_path \
|| ynh_die "There is already a directory: $final_path " || ynh_die "There is already a directory: $final_path "

View file

@ -17,7 +17,7 @@ ynh_print_info "Loading installation settings..."
app=$YNH_APP_INSTANCE_NAME app=$YNH_APP_INSTANCE_NAME
domain=$(ynh_app_setting_get $app domain) 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) final_path=$(ynh_app_setting_get $app final_path)
statedir=$(ynh_app_setting_get $app statedir) statedir=$(ynh_app_setting_get $app statedir)
final_logpath=$(ynh_app_setting_get $app final_logpath) final_logpath=$(ynh_app_setting_get $app final_logpath)