Fixing puppet-lint errors.
This commit is contained in:
parent
2f83cb7d4a
commit
34c36045fa
59 changed files with 995 additions and 990 deletions
|
@ -28,14 +28,14 @@ define util::extract::tar($source, $ensure=present, $strip=0, $preserve=false) {
|
|||
exec { "tar-rmdir-${name}":
|
||||
path => "/bin:/usr/bin:/sbin:/usr/sbin",
|
||||
command => "rm -fr ${name}",
|
||||
before => File["${name}"],
|
||||
subscribe => File["${source}"],
|
||||
before => File[$name],
|
||||
subscribe => File[$source],
|
||||
refreshonly => true,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
file { "${name}":
|
||||
file { $name:
|
||||
ensure => directory,
|
||||
mode => 0755,
|
||||
owner => "root",
|
||||
|
@ -65,7 +65,7 @@ define util::extract::tar($source, $ensure=present, $strip=0, $preserve=false) {
|
|||
exec { "tar-extract-${name}":
|
||||
path => "/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/usr/local/sbin",
|
||||
command => $command,
|
||||
require => File["${name}"],
|
||||
require => File[$name],
|
||||
unless => "test -n \"$(ls -A ${name})\"",
|
||||
}
|
||||
|
||||
|
@ -95,8 +95,8 @@ define util::extract::zip($source, $ensure=present) {
|
|||
exec { "zip-rmdir-${name}":
|
||||
path => "/bin:/usr/bin:/sbin:/usr/sbin",
|
||||
command => "rm -fr ${name}",
|
||||
before => File["${name}"],
|
||||
subscribe => File["${source}"],
|
||||
before => File[$name],
|
||||
subscribe => File[$source],
|
||||
refreshonly => true,
|
||||
}
|
||||
}
|
||||
|
@ -104,7 +104,7 @@ define util::extract::zip($source, $ensure=present) {
|
|||
|
||||
$command = "unzip ${source} -d ${name}"
|
||||
|
||||
file { "${name}":
|
||||
file { $name:
|
||||
ensure => directory,
|
||||
mode => 0755,
|
||||
owner => root,
|
||||
|
@ -114,7 +114,7 @@ define util::extract::zip($source, $ensure=present) {
|
|||
exec { "zip-extract-${name}":
|
||||
path => "/bin:/usr/bin:/sbin:/usr/sbin",
|
||||
command => $command,
|
||||
require => File["${name}"],
|
||||
require => File[$name],
|
||||
unless => "test -n \"$(ls -A ${name})\"",
|
||||
}
|
||||
|
||||
|
@ -158,7 +158,7 @@ define util::patch($source, $strip=0) {
|
|||
|
||||
exec { "patch-${name}-${source}":
|
||||
path => "/bin:/usr/bin:/sbin:/usr/sbin",
|
||||
cwd => "${name}",
|
||||
cwd => $name,
|
||||
command => "patch -N -b -t -p${strip} < ${source}",
|
||||
onlyif => "patch --dry-run -N -b -t -p${strip} < ${source}",
|
||||
require => Class["util::patch::package"],
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue