Skip to content

Commit a9b04cb

Browse files
committed
Merge pull request #35 from tylerwalts/puppet-lint-cleanup
Updated formatting and cleanup for puppet lint.
2 parents 9c3412e + 7ac8c41 commit a9b04cb

File tree

2 files changed

+242
-245
lines changed

2 files changed

+242
-245
lines changed

manifests/init.pp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,8 @@
115115
}
116116
}
117117

118-
if ! defined(File["${install_dir}"]) {
119-
file { "${install_dir}":
118+
if ! defined(File[$install_dir]) {
119+
file { $install_dir:
120120
ensure => directory,
121121
}
122122
}
@@ -126,7 +126,7 @@
126126
if ( $use_cache ){
127127
file { "${install_dir}/${installerFilename}":
128128
source => "${cache_source}${installerFilename}",
129-
require => File["${install_dir}"],
129+
require => File[$install_dir],
130130
} ->
131131
exec { 'get_jdk_installer':
132132
cwd => $install_dir,
@@ -174,7 +174,7 @@
174174
}
175175

176176
# Ensure that files belong to root
177-
file {"$java_home":
177+
file {$java_home:
178178
recurse => true,
179179
owner => root,
180180
group => root,
@@ -242,14 +242,14 @@
242242
}
243243
}
244244
Suse: {
245-
if ( $default_java ) {
245+
if ( $default_java ) {
246246
class { 'jdk_oracle::suse' :
247-
version => $version,
248-
version_u => $version_u,
249-
version_b => $version_b,
250-
java_home => $java_home,
247+
version => $version,
248+
version_u => $version_u,
249+
version_b => $version_b,
250+
java_home => $java_home,
251251
}
252-
}
252+
}
253253
}
254254

255255
default: { fail('Unsupported OS, implement me?') }

0 commit comments

Comments
 (0)