Skip to content

Commit

Permalink
fix lint errors
Browse files Browse the repository at this point in the history
  • Loading branch information
jdowning committed Aug 26, 2015
1 parent f346f02 commit f6fff32
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 21 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ You can test this module with rspec:
## Vagrant

You can also test this module in a Vagrant box. There are two box definitons included in the
Vagrant file for CentOS, Debian, and Ubuntu testing. You will need to use `librarian-puppet` to setup
Vagrant file for CentOS and Ubuntu testing. You will need to use `librarian-puppet` to setup
dependencies:

bundle install
Expand All @@ -95,4 +95,4 @@ To test both boxes:

To test one distribution:

vagrant up [centos|debian|ubuntu]
vagrant up [centos|ubuntu]
22 changes: 11 additions & 11 deletions manifests/build.pp
Original file line number Diff line number Diff line change
Expand Up @@ -112,22 +112,22 @@
$patch ? { undef => '', false => '', default => ' --patch' } ], '')

exec { "own-plugins-${title}":
command => "chown -R ${owner}:${group} ${install_dir}/plugins",
user => 'root',
unless => "test -d ${install_dir}/versions/${title}",
require => Class['rbenv'],
command => "chown -R ${owner}:${group} ${install_dir}/plugins",
user => 'root',
unless => "test -d ${install_dir}/versions/${title}",
require => Class['rbenv'],
}->
exec { "git-pull-rubybuild-${title}":
command => 'git reset --hard HEAD && git pull',
cwd => "${install_dir}/plugins/ruby-build",
user => 'root',
unless => "test -d ${install_dir}/versions/${title}",
require => Rbenv::Plugin['sstephenson/ruby-build'],
command => 'git reset --hard HEAD && git pull',
cwd => "${install_dir}/plugins/ruby-build",
user => 'root',
unless => "test -d ${install_dir}/versions/${title}",
require => Rbenv::Plugin['sstephenson/ruby-build'],
}->
exec { "rbenv-install-${title}":
# patch file must be read from stdin only if supplied
command => sprintf("rbenv install ${title}${install_options}%s", $patch ? { undef => '', false => '', default => " < ${patch_file}" }),
creates => "${install_dir}/versions/${title}",
command => sprintf("rbenv install ${title}${install_options}%s", $patch ? { undef => '', false => '', default => " < ${patch_file}" }),
creates => "${install_dir}/versions/${title}",
}~>
exec { "rbenv-ownit-${title}":
command => "chown -R ${owner}:${group} \
Expand Down
16 changes: 8 additions & 8 deletions manifests/plugin.pp
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@
Exec { environment => $env }

exec { "install-${name}":
command => "/usr/bin/git clone https://github.com/${name}.git",
cwd => "${install_dir}/plugins",
onlyif => "/usr/bin/test -d ${install_dir}/plugins",
unless => "/usr/bin/test -d ${install_dir}/plugins/${plugin[1]}",
command => "/usr/bin/git clone https://github.com/${name}.git",
cwd => "${install_dir}/plugins",
onlyif => "/usr/bin/test -d ${install_dir}/plugins",
unless => "/usr/bin/test -d ${install_dir}/plugins/${plugin[1]}",
}~>
exec { "rbenv-permissions-${name}":
command => "/bin/chown -R ${rbenv::owner}:${rbenv::group} \
Expand All @@ -57,10 +57,10 @@
# run `git pull` on each run if we want to keep the plugin updated
if $latest == true {
exec { "update-${name}":
command => '/usr/bin/git pull',
cwd => "${install_dir}/plugins/${plugin[1]}",
user => $rbenv::owner,
onlyif => "/usr/bin/test -d ${install_dir}/plugins/${plugin[1]}",
command => '/usr/bin/git pull',
cwd => "${install_dir}/plugins/${plugin[1]}",
user => $rbenv::owner,
onlyif => "/usr/bin/test -d ${install_dir}/plugins/${plugin[1]}",
}
}
}

0 comments on commit f6fff32

Please sign in to comment.