From 03944ddd477e718309b11e50812967a6617118ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Mon, 20 Aug 2018 22:51:26 +0200 Subject: [PATCH] Store settings before to test the install --- scripts/install | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/scripts/install b/scripts/install index ec106dc..5276108 100644 --- a/scripts/install +++ b/scripts/install @@ -25,23 +25,11 @@ domain=$YNH_APP_ARG_DOMAIN path_url=$YNH_APP_ARG_PATH app=$YNH_APP_INSTANCE_NAME - -#================================================= -# CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS -#================================================= - -# Check destination directory final_path="/opt/yunohost/$app" -test ! -e "$final_path" || ynh_die "This path already contains a folder" # Normalize the url path syntax path_url=$(ynh_normalize_url_path "$path_url") -# Check web path availability -ynh_webpath_available "$domain" "$path_url" -# Register (book) web path -ynh_webpath_register "$app" "$domain" "$path_url" - #================================================= # STORE SETTINGS FROM MANIFEST #================================================= @@ -50,6 +38,18 @@ ynh_app_setting_set "$app" domain "$domain" ynh_app_setting_set "$app" path "$path_url" ynh_app_setting_set "$app" final_path "$final_path" +#================================================= +# CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS +#================================================= + +# Check destination directory +test ! -e "$final_path" || ynh_die "This path already contains a folder" + +# Check web path availability +ynh_webpath_available "$domain" "$path_url" +# Register (book) web path +ynh_webpath_register "$app" "$domain" "$path_url" + #================================================= # STANDARD MODIFICATIONS #=================================================