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

[fix] Use --output-as instead of deprecated options

Browse source
This commit is contained in:
Jérôme Lebleu 2015-11-30 18:35:41 +01:00
parent 835000b262
commit 13dd9b4f89
5 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
data/apps/helpers.d/user
View file

@ -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}"
}

2
data/hooks/conf_regen/12-metronome
View file

@ -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

2
data/hooks/conf_regen/15-nginx
View file

@ -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

2
data/hooks/conf_regen/28-rmilter
View file

@ -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 ] \

2
data/hooks/conf_regen/43-dnsmasq
View file

@ -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