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

Merge remote-tracking branch 'origin/unstable' into unstable

Browse source
This commit is contained in:
Weblate 2015-11-30 19:03:25 +01:00
commit 59ed47f14a
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,9 @@
# Check if a user exists # Check if a user exists
# #
# example: ynh_user_exists 'toto' || exit 1
#
# usage: ynh_user_exists username # usage: ynh_user_exists username
# | arg: username - the username to check
# | ret: retcode - 0 if user exists, 1 otherwise # | ret: retcode - 0 if user exists, 1 otherwise
ynh_user_exists() { ynh_user_exists() {
sudo yunohost user list --output-as json | grep -q "\"username\": \"${1}\"" sudo yunohost user list --output-as json | grep -q "\"username\": \"${1}\""
@ -8,7 +11,11 @@ ynh_user_exists() {
# Retrieve a user information # Retrieve a user information
# #
# usage: ynh_user_info username key # example: mail=$(ynh_user_get_info 'toto' 'mail')
#
# usage: ynh_user_get_info username key
# | arg: username - the username to retrieve info from
# | arg: key - the key to retrieve
# | ret: string - the key's value # | ret: string - the key's value
ynh_user_get_info() { ynh_user_get_info() {
sudo yunohost user info "${1}" --output-as plain | ynh_get_plain_key "${2}" sudo yunohost user info "${1}" --output-as plain | ynh_get_plain_key "${2}"

2
data/apps/helpers.d/utils
View file

@ -12,7 +12,7 @@ ynh_get_plain_key() {
[[ "$line" =~ ^${prefix}[^#] ]] && return [[ "$line" =~ ^${prefix}[^#] ]] && return
echo $line echo $line
elif [[ "$line" =~ ^${prefix}${key}$ ]]; then elif [[ "$line" =~ ^${prefix}${key}$ ]]; then
if [[ -n "$1" ]]; then if [[ -n "${1:-}" ]]; then
prefix+="#" prefix+="#"
key=$1 key=$1
shift shift