YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

[enh] Use named args in helpers calls

Browse source 
Co-authored-by: Kayou <pierre@kayou.io>
This commit is contained in:
ljf (zamentur) 2021-09-08 16:49:42 +02:00 • committed by GitHub
parent f2b779c962
commit 924df9733e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
data/helpers.d/config
View file

@ -145,7 +145,7 @@ _ynh_app_config_apply() {
ynh_backup_if_checksum_is_different --file="$bind_file" ynh_backup_if_checksum_is_different --file="$bind_file"
echo "${!short_setting}" > "$bind_file" echo "${!short_setting}" > "$bind_file"
ynh_store_file_checksum --file="$bind_file" --update_only ynh_store_file_checksum --file="$bind_file" --update_only
ynh_print_info "File '$bind_file' overwrited with the content you provieded in '${short_setting}' question" ynh_print_info --message="File '$bind_file' overwrited with the content you provieded in '${short_setting}' question"
# Set value into a kind of key/value file # Set value into a kind of key/value file
else else
@ -164,8 +164,8 @@ _ynh_app_config_apply() {
ynh_store_file_checksum --file="$bind_file" --update_only ynh_store_file_checksum --file="$bind_file" --update_only
# We stored the info in settings in order to be able to upgrade the app # We stored the info in settings in order to be able to upgrade the app
ynh_app_setting_set $app $short_setting "${!short_setting}" ynh_app_setting_set --app=$app --key=$short_setting --value="${!short_setting}"
ynh_print_info "Configuration key '$bind_key' edited into $bind_file" ynh_print_info --message="Configuration key '$bind_key' edited into $bind_file"
fi fi
fi fi
@ -194,7 +194,6 @@ _ynh_app_config_validate() {
ynh_script_progression --message="Checking what changed in the new configuration..." --weight=1 ynh_script_progression --message="Checking what changed in the new configuration..." --weight=1
local nothing_changed=true local nothing_changed=true
local changes_validated=true local changes_validated=true
#for changed_status in "${!changed[@]}"
for short_setting in "${!old[@]}" for short_setting in "${!old[@]}"
do do
changed[$short_setting]=false changed[$short_setting]=false
@ -237,7 +236,7 @@ _ynh_app_config_validate() {
done done
if [[ "$nothing_changed" == "true" ]] if [[ "$nothing_changed" == "true" ]]
then then
ynh_print_info "Nothing has changed" ynh_print_info --message="Nothing has changed"
exit 0 exit 0
fi fi

2
data/helpers.d/utils
View file

@ -517,7 +517,7 @@ ynh_read_var_in_file() {
ynh_handle_getopts_args "$@" ynh_handle_getopts_args "$@"
after="${after:-}" after="${after:-}"
[[ -f $file ]] || ynh_die "File $file does not exists" [[ -f $file ]] || ynh_die --message="File $file does not exists"
# Get the line number after which we search for the variable # Get the line number after which we search for the variable
local line_number=1 local line_number=1