summaryrefslogtreecommitdiff
path: root/lib/chef/provider/group
diff options
context:
space:
mode:
Diffstat (limited to 'lib/chef/provider/group')
-rw-r--r--lib/chef/provider/group/aix.rb12
-rw-r--r--lib/chef/provider/group/dscl.rb2
-rw-r--r--lib/chef/provider/group/gpasswd.rb8
-rw-r--r--lib/chef/provider/group/groupadd.rb6
-rw-r--r--lib/chef/provider/group/groupmod.rb12
-rw-r--r--lib/chef/provider/group/pw.rb8
-rw-r--r--lib/chef/provider/group/suse.rb4
-rw-r--r--lib/chef/provider/group/usermod.rb2
8 files changed, 27 insertions, 27 deletions
diff --git a/lib/chef/provider/group/aix.rb b/lib/chef/provider/group/aix.rb
index 5c500e2753..7da07b8006 100644
--- a/lib/chef/provider/group/aix.rb
+++ b/lib/chef/provider/group/aix.rb
@@ -32,33 +32,33 @@ class Chef
end
def create_group
- shell_out_compact!("mkgroup", set_options, new_resource.group_name)
+ shell_out!("mkgroup", set_options, new_resource.group_name)
modify_group_members
end
def manage_group
options = set_options
if options.size > 0
- shell_out_compact!("chgroup", options, new_resource.group_name)
+ shell_out!("chgroup", options, new_resource.group_name)
end
modify_group_members
end
def remove_group
- shell_out_compact!("rmgroup", new_resource.group_name)
+ shell_out!("rmgroup", new_resource.group_name)
end
def add_member(member)
- shell_out_compact!("chgrpmem", "-m", "+", member, new_resource.group_name)
+ shell_out!("chgrpmem", "-m", "+", member, new_resource.group_name)
end
def set_members(members)
return if members.empty?
- shell_out_compact!("chgrpmem", "-m", "=", members.join(","), new_resource.group_name)
+ shell_out!("chgrpmem", "-m", "=", members.join(","), new_resource.group_name)
end
def remove_member(member)
- shell_out_compact!("chgrpmem", "-m", "-", member, new_resource.group_name)
+ shell_out!("chgrpmem", "-m", "-", member, new_resource.group_name)
end
def set_options
diff --git a/lib/chef/provider/group/dscl.rb b/lib/chef/provider/group/dscl.rb
index 81c7d66aa8..a5c4d27ddb 100644
--- a/lib/chef/provider/group/dscl.rb
+++ b/lib/chef/provider/group/dscl.rb
@@ -27,7 +27,7 @@ class Chef
argdup = args.dup
cmd = argdup.shift
shellcmd = [ "dscl", ".", "-#{cmd}", argdup ]
- status = shell_out_compact(shellcmd)
+ status = shell_out(shellcmd)
stdout_result = ""
stderr_result = ""
status.stdout.each_line { |line| stdout_result << line }
diff --git a/lib/chef/provider/group/gpasswd.rb b/lib/chef/provider/group/gpasswd.rb
index d8aff10d5b..a5d6a378c0 100644
--- a/lib/chef/provider/group/gpasswd.rb
+++ b/lib/chef/provider/group/gpasswd.rb
@@ -39,18 +39,18 @@ class Chef
def set_members(members)
if members.empty?
- shell_out_compact!("gpasswd", "-M", "", new_resource.group_name)
+ shell_out!("gpasswd", "-M", "", new_resource.group_name)
else
- shell_out_compact!("gpasswd", "-M", members.join(","), new_resource.group_name)
+ shell_out!("gpasswd", "-M", members.join(","), new_resource.group_name)
end
end
def add_member(member)
- shell_out_compact!("gpasswd", "-a", member, new_resource.group_name)
+ shell_out!("gpasswd", "-a", member, new_resource.group_name)
end
def remove_member(member)
- shell_out_compact!("gpasswd", "-d", member, new_resource.group_name)
+ shell_out!("gpasswd", "-d", member, new_resource.group_name)
end
end
end
diff --git a/lib/chef/provider/group/groupadd.rb b/lib/chef/provider/group/groupadd.rb
index 7d7fac146c..fb8f306034 100644
--- a/lib/chef/provider/group/groupadd.rb
+++ b/lib/chef/provider/group/groupadd.rb
@@ -44,19 +44,19 @@ class Chef
# Create the group
def create_group
- shell_out_compact!("groupadd", set_options, groupadd_options)
+ shell_out!("groupadd", set_options, groupadd_options)
modify_group_members
end
# Manage the group when it already exists
def manage_group
- shell_out_compact!("groupmod", set_options)
+ shell_out!("groupmod", set_options)
modify_group_members
end
# Remove the group
def remove_group
- shell_out_compact!("groupdel", new_resource.group_name)
+ shell_out!("groupdel", new_resource.group_name)
end
def modify_group_members
diff --git a/lib/chef/provider/group/groupmod.rb b/lib/chef/provider/group/groupmod.rb
index 13f83db4c4..ac033e607d 100644
--- a/lib/chef/provider/group/groupmod.rb
+++ b/lib/chef/provider/group/groupmod.rb
@@ -32,7 +32,7 @@ class Chef
# Create the group
def create_group
- shell_out_compact!("group", "add", set_options)
+ shell_out!("group", "add", set_options)
add_group_members(new_resource.members)
end
@@ -79,14 +79,14 @@ class Chef
# Remove the group
def remove_group
- shell_out_compact!("group", "del", new_resource.group_name)
+ shell_out!("group", "del", new_resource.group_name)
end
# Adds a list of usernames to the group using `user mod`
def add_group_members(members)
logger.trace("#{new_resource} adding members #{members.join(', ')}") unless members.empty?
members.each do |user|
- shell_out_compact!("user", "mod", "-G", new_resource.group_name, user)
+ shell_out!("user", "mod", "-G", new_resource.group_name, user)
end
end
@@ -94,11 +94,11 @@ class Chef
# "<name>_bak", create a new group with the same GID and
# "<name>", then set correct members on that group
def reset_group_membership
- shell_out_compact!("group", "mod", "-n", "#{new_resource.group_name}_bak", new_resource.group_name)
+ shell_out!("group", "mod", "-n", "#{new_resource.group_name}_bak", new_resource.group_name)
- shell_out_compact!("group", "add", set_options(overwrite_gid: true))
+ shell_out!("group", "add", set_options(overwrite_gid: true))
- shell_out_compact!("group", "del", "#{new_resource.group_name}_bak")
+ shell_out!("group", "del", "#{new_resource.group_name}_bak")
end
# Little bit of magic as per Adam's useradd provider to pull and assign the command line flags
diff --git a/lib/chef/provider/group/pw.rb b/lib/chef/provider/group/pw.rb
index b0393a147e..2a1f294bde 100644
--- a/lib/chef/provider/group/pw.rb
+++ b/lib/chef/provider/group/pw.rb
@@ -48,24 +48,24 @@ class Chef
command += [ "-M", new_resource.members.join(",") ]
end
- shell_out_compact!(command)
+ shell_out!(command)
end
# Manage the group when it already exists
def manage_group
member_options = set_members_options
if member_options.empty?
- shell_out_compact!("pw", "groupmod", set_options)
+ shell_out!("pw", "groupmod", set_options)
else
member_options.each do |option|
- shell_out_compact!("pw", "groupmod", set_options, option)
+ shell_out!("pw", "groupmod", set_options, option)
end
end
end
# Remove the group
def remove_group
- shell_out_compact!("pw", "groupdel", new_resource.group_name)
+ shell_out!("pw", "groupdel", new_resource.group_name)
end
# Little bit of magic as per Adam's useradd provider to pull and assign the command line flags
diff --git a/lib/chef/provider/group/suse.rb b/lib/chef/provider/group/suse.rb
index 0790d2c2d9..7e8473c901 100644
--- a/lib/chef/provider/group/suse.rb
+++ b/lib/chef/provider/group/suse.rb
@@ -66,7 +66,7 @@ class Chef
end
def add_member(member)
- shell_out_compact!("groupmod", "-A", member, new_resource.group_name)
+ shell_out!("groupmod", "-A", member, new_resource.group_name)
end
def to_remove(members)
@@ -74,7 +74,7 @@ class Chef
end
def remove_member(member)
- shell_out_compact!("groupmod", "-R", member, new_resource.group_name)
+ shell_out!("groupmod", "-R", member, new_resource.group_name)
end
end
diff --git a/lib/chef/provider/group/usermod.rb b/lib/chef/provider/group/usermod.rb
index 3874f7b4de..6b040b7190 100644
--- a/lib/chef/provider/group/usermod.rb
+++ b/lib/chef/provider/group/usermod.rb
@@ -66,7 +66,7 @@ class Chef
end
def add_member(member)
- shell_out_compact!("usermod", append_flags, new_resource.group_name, member)
+ shell_out!("usermod", append_flags, new_resource.group_name, member)
end
def remove_member(member)