Skip to content

replace deprecated egrep with grep -E #376

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Stricken1670 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

replace deprecated egrep with grep -E #376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions manifests/copr.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,21 +32,21 @@
'enabled': {
exec { "dnf -y copr enable ${copr_repo}":
path => '/bin:/usr/bin:/sbin/:/usr/sbin',
unless => "dnf copr list | egrep -q '${copr_name}\$'",
unless => "dnf copr list | grep -Eq '${copr_name}\$'",
require => Package[$prereq_plugin],
}
}
'disabled': {
exec { "dnf -y copr disable ${copr_repo}":
path => '/bin:/usr/bin:/sbin/:/usr/sbin',
unless => "dnf copr list | egrep -q '${copr_name} \\(disabled\\)\$'",
unless => "dnf copr list | grep -Eq '${copr_name} \\(disabled\\)\$'",
require => Package[$prereq_plugin],
}
}
'removed': {
exec { "dnf -y copr remove ${copr_repo}":
path => '/bin:/usr/bin:/sbin/:/usr/sbin',
onlyif => "dnf copr list | egrep -q '${copr_name}'",
onlyif => "dnf copr list | grep -Eq '${copr_name}'",
require => Package[$prereq_plugin],
}
}
Expand Down
4 changes: 2 additions & 2 deletions manifests/group.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
'present', default: { # just install the yum group and ensure the group is present.
exec { "yum-groupinstall-${name}":
command => join(concat(["yum -y group install '${name}'"], $install_options), ' '),
unless => "yum grouplist hidden '${name}' | egrep -i '^Installed.+Groups:$'",
unless => "yum grouplist hidden '${name}' | grep -Ei '^Installed.+Groups:$'",
timeout => $timeout,
}
}
Expand All @@ -45,7 +45,7 @@
'absent', 'purged': {
exec { "yum-groupremove-${name}":
command => "yum -y group remove '${name}'",
onlyif => "yum grouplist hidden '${name}' | egrep -i '^Installed.+Groups:$'",
onlyif => "yum grouplist hidden '${name}' | grep -Ei '^Installed.+Groups:$'",
timeout => $timeout,
}
}
Expand Down
6 changes: 3 additions & 3 deletions spec/defines/copr_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
it {
is_expected.to contain_exec("dnf -y copr enable #{title}").with(
'path' => '/bin:/usr/bin:/sbin/:/usr/sbin',
'unless' => "dnf copr list | egrep -q '#{title}$'",
'unless' => "dnf copr list | grep -Eq '#{title}$'",
'require' => "Package[#{prereq_plugin}]"
)
}
Expand All @@ -95,7 +95,7 @@
it {
is_expected.to contain_exec("dnf -y copr disable #{title}").with(
'path' => '/bin:/usr/bin:/sbin/:/usr/sbin',
'unless' => "dnf copr list | egrep -q '#{title} \\(disabled\\)$'",
'unless' => "dnf copr list | grep -Eq '#{title} \\(disabled\\)$'",
'require' => "Package[#{prereq_plugin}]"
)
}
Expand All @@ -109,7 +109,7 @@
it {
is_expected.to contain_exec("dnf -y copr remove #{title}").with(
'path' => '/bin:/usr/bin:/sbin/:/usr/sbin',
'onlyif' => "dnf copr list | egrep -q '#{title}'",
'onlyif' => "dnf copr list | grep -Eq '#{title}'",
'require' => "Package[#{prereq_plugin}]"
)
}
Expand Down
Loading