diff --git a/scripts/install b/scripts/install index 4a3b933..99b24d1 100644 --- a/scripts/install +++ b/scripts/install @@ -27,7 +27,6 @@ ynh_abort_if_errors domain=$YNH_APP_ARG_DOMAIN path_url=$YNH_APP_ARG_PATH is_public=$YNH_APP_ARG_IS_PUBLIC -root_access=$YNH_APP_ARG_ROOT_ACCESS app=$YNH_APP_INSTANCE_NAME @@ -49,7 +48,6 @@ ynh_script_progression --message="Storing installation settings..." --weight=1 ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=path --value=$path_url ynh_app_setting_set --app=$app --key=is_public --value=$is_public -ynh_app_setting_set --app=$app --key=root_access --value=$root_access #================================================= # INSTALL DEPENDENCIES @@ -68,13 +66,7 @@ ynh_app_setting_set --app=$app --key=final_path --value=$final_path mkdir -p $final_path -if [[ $root_access -eq 1 ]]; then - #copy files from with_root_access folder to the final_path - cp -a ../sources/with_root_access/. $final_path -else - #copy files from root_access_disabled folder to the final_path - cp -a ../sources/root_access_disabled/. $final_path -fi +cp -a ../sources/root_access_disabled/. $final_path #================================================= # CREATE DEDICATED USER diff --git a/scripts/restore b/scripts/restore index bb80ac7..5b13ef3 100644 --- a/scripts/restore +++ b/scripts/restore @@ -14,10 +14,6 @@ source /usr/share/yunohost/helpers # MANAGE SCRIPT FAILURE #================================================= -ynh_clean_setup () { - #### Remove this function if there's nothing to clean before calling the remove script. - true -} # Exit if an error occurs during the execution of the script ynh_abort_if_errors diff --git a/scripts/upgrade b/scripts/upgrade index ec4eeaa..da39e63 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -69,13 +69,7 @@ ynh_secure_remove $final_path mkdir -p $final_path -if [[ $root_access -eq 1 ]]; then - #copy files from with_root_access folder to the final_path - cp -a ../sources/with_root_access/. $final_path -else - #copy files from root_access_disabled folder to the final_path - cp -a ../sources/root_access_disabled/. $final_path -fi +cp -a ../sources/root_access_disabled/. $final_path #================================================= # SECURE FILES AND DIRECTORIES