Skip to content
Browse files

Renames #user.gid to #user.group

  • Loading branch information...
1 parent 16ed341 commit f38578eb9c19033ab530d23ef6134e3ad6839023 Yurii Rashkovskii committed Feb 20, 2012
Showing with 8 additions and 8 deletions.
  1. +1 −1 apps/htoad/include/stdlib.hrl
  2. +2 −2 apps/htoad/src/htoad_lfs.erl
  3. +5 −5 apps/htoad/src/htoad_users.erl
View
2 apps/htoad/include/stdlib.hrl
@@ -20,7 +20,7 @@
name,
password,
uid,
- gid,
+ group,
quota,
comment,
gecos,
View
4 apps/htoad/src/htoad_lfs.erl
@@ -146,7 +146,7 @@ ensure_group_access_by_name(Engine, {ensure, present,
type = Type,
group = FileGroup
} = File},
- {current_user, #user{ gid = Gid }},
+ {current_user, #user{ group = Gid }},
#file{
path = Path,
type = Type
@@ -161,7 +161,7 @@ ensure_group_access_by_gid(Engine, {ensure, present,
type = Type,
group = FileGroup
} = File},
- {current_user, #user{ gid = Gid }},
+ {current_user, #user{ group = Gid }},
#file{
path = Path,
type = Type
View
10 apps/htoad/src/htoad_users.erl
@@ -195,10 +195,10 @@ useradd_options(#user{} = User) ->
re:replace(string:join([
case User#user.home of undefined -> []; Home -> "--home " ++ Home end,
case User#user.shell of undefined -> []; Shell -> "--shell " ++ Shell end,
- case User#user.gid of
+ case User#user.group of
undefined -> [];
- Gid when is_integer(Gid) -> "--gid " ++ integer_to_list(Gid);
- Gid when is_list(Gid) -> "--gid " ++ Gid
+ Group when is_integer(Group) -> "--gid " ++ integer_to_list(Group);
+ Group when is_list(Group) -> "--gid " ++ Group
end,
case User#user.uid of undefined -> []; Uid -> "--uid " ++ integer_to_list(Uid) end,
case User#user.password of undefined -> []; Password ->
@@ -234,7 +234,7 @@ parse_lines(Engine, Lines) ->
name = Name,
password = Password,
uid = list_to_integer(Uid),
- gid = list_to_integer(Gid),
+ group = list_to_integer(Gid),
gecos = Gecos,
home = Home,
shell = Shell
@@ -245,7 +245,7 @@ parse_lines(Engine, Lines) ->
name = Name,
password = Password,
uid = list_to_integer(Uid),
- gid = list_to_integer(Gid),
+ group = list_to_integer(Gid),
quota = Quota,
comment = Comment,
gecos = Gecos,

0 comments on commit f38578e

Please sign in to comment.
Something went wrong with that request. Please try again.