diff --git a/data/apps/helpers.d/user b/data/apps/helpers.d/user index 1fd8d203c..69f96e0cf 100644 --- a/data/apps/helpers.d/user +++ b/data/apps/helpers.d/user @@ -3,7 +3,7 @@ # usage: ynh_user_exists username # | ret: retcode - 0 if user exists, 1 otherwise ynh_user_exists() { - sudo yunohost user list --json | grep -q "\"username\": \"${1}\"" + sudo yunohost user list --output-as json | grep -q "\"username\": \"${1}\"" } # Retrieve a user information @@ -11,5 +11,5 @@ ynh_user_exists() { # usage: ynh_user_info username key # | ret: string - the key's value ynh_user_get_info() { - sudo yunohost user info "${1}" --plain | ynh_get_plain_key "${2}" + sudo yunohost user info "${1}" --output-as plain | ynh_get_plain_key "${2}" } diff --git a/data/hooks/conf_regen/12-metronome b/data/hooks/conf_regen/12-metronome index ada37e8d8..69a13a1dc 100644 --- a/data/hooks/conf_regen/12-metronome +++ b/data/hooks/conf_regen/12-metronome @@ -28,7 +28,7 @@ safe_copy metronome.cfg.lua /etc/metronome/metronome.cfg.lua need_restart=False sudo mkdir -p /etc/metronome/conf.d -domain_list=$(sudo yunohost domain list --plain) +domain_list=$(sudo yunohost domain list --output-as plain) # Copy a configuration file for each YunoHost domain for domain in $domain_list; do diff --git a/data/hooks/conf_regen/15-nginx b/data/hooks/conf_regen/15-nginx index 889d7408f..7a4795202 100644 --- a/data/hooks/conf_regen/15-nginx +++ b/data/hooks/conf_regen/15-nginx @@ -37,7 +37,7 @@ done if [ -f /etc/yunohost/installed ]; then need_restart=False - domain_list=$(sudo yunohost domain list --plain) + domain_list=$(sudo yunohost domain list --output-as plain) # Copy a configuration file for each YunoHost domain for domain in $domain_list; do diff --git a/data/hooks/conf_regen/28-rmilter b/data/hooks/conf_regen/28-rmilter index 7999318d9..abdb7d670 100644 --- a/data/hooks/conf_regen/28-rmilter +++ b/data/hooks/conf_regen/28-rmilter @@ -24,7 +24,7 @@ sudo chown _rmilter: /var/run/rmilter # Create DKIM key for each YunoHost domain sudo mkdir -p /etc/dkim -domain_list=$(sudo yunohost domain list --plain) +domain_list=$(sudo yunohost domain list --output-as plain) for domain in $domain_list; do [ -f /etc/dkim/$domain.mail.key ] \ diff --git a/data/hooks/conf_regen/43-dnsmasq b/data/hooks/conf_regen/43-dnsmasq index 4ce4ea6d0..dae14b0f6 100644 --- a/data/hooks/conf_regen/43-dnsmasq +++ b/data/hooks/conf_regen/43-dnsmasq @@ -24,7 +24,7 @@ ipv6=$(ip route get 2000:: | grep -q "unreachable" && echo '' \ sudo mkdir -p /etc/dnsmasq.d -domain_list=$(sudo yunohost domain list --plain) +domain_list=$(sudo yunohost domain list --output-as plain) # Copy a configuration file for each YunoHost domain for domain in $domain_list; do