diff --git a/data/helpers.d/setting b/data/helpers.d/setting index b8c57e158..af358d274 100644 --- a/data/helpers.d/setting +++ b/data/helpers.d/setting @@ -16,7 +16,11 @@ ynh_app_setting_get() { # Manage arguments with getopts ynh_handle_getopts_args "$@" - ynh_app_setting "get" "$app" "$key" + if [[ $key =~ (unprotected|protected|skipped)_ ]]; then + yunohost app setting $app $key + else + ynh_app_setting "get" "$app" "$key" + fi } # Set an application setting @@ -37,7 +41,11 @@ ynh_app_setting_set() { # Manage arguments with getopts ynh_handle_getopts_args "$@" - ynh_app_setting "set" "$app" "$key" "$value" + if [[ $key =~ (unprotected|protected|skipped)_ ]]; then + yunohost app setting $app $key -v $value + else + ynh_app_setting "set" "$app" "$key" "$value" + fi } # Delete an application setting @@ -56,7 +64,11 @@ ynh_app_setting_delete() { # Manage arguments with getopts ynh_handle_getopts_args "$@" - ynh_app_setting "delete" "$app" "$key" + if [[ "$key" =~ (unprotected|skipped|protected)_ ]]; then + yunohost app setting $app $key -d + else + ynh_app_setting "delete" "$app" "$key" + fi } # Small "hard-coded" interface to avoid calling "yunohost app" directly each @@ -66,11 +78,6 @@ ynh_app_setting_delete() { # ynh_app_setting() { - if [[ "$1" == "delete" ]] && [[ "$3" =~ ^(unprotected|skipped)_ ]] - then - current_value=$(ynh_app_setting_get --app=$app --key=$3) - fi - ACTION="$1" APP="$2" KEY="$3" VALUE="${4:-}" python2.7 - <