diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2016-02-05 15:00:00 -0800 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2016-02-05 15:00:00 -0800 |
| commit | 686113531d23f30e9973d659c456ae33eb9cff1f (patch) | |
| tree | f225de7251a8b49b8d183dd168bab0a0addbe23f /omnibus | |
| parent | d1cf34b059a16a81e0fc48de52ba29863bb41fe6 (diff) | |
| download | chef-686113531d23f30e9973d659c456ae33eb9cff1f.tar.gz | |
autofixing whitespace cops
4174 Style/SpaceInsideHashLiteralBraces
1860 Style/SpaceAroundOperators
1336 Style/SpaceInsideBlockBraces
1292 Style/AlignHash
997 Style/SpaceAfterComma
860 Style/SpaceAroundEqualsInParameterDefault
310 Style/EmptyLines
294 Style/IndentationConsistency
267 Style/TrailingWhitespace
238 Style/ExtraSpacing
212 Style/SpaceBeforeBlockBraces
166 Style/MultilineOperationIndentation
144 Style/TrailingBlankLines
120 Style/EmptyLineBetweenDefs
101 Style/IndentationWidth
82 Style/SpaceAroundBlockParameters
40 Style/EmptyLinesAroundMethodBody
29 Style/EmptyLinesAroundAccessModifier
1 Style/RescueEnsureAlignment
Diffstat (limited to 'omnibus')
| -rw-r--r-- | omnibus/config/projects/chef.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/omnibus/config/projects/chef.rb b/omnibus/config/projects/chef.rb index c8ba4e74bb..c85a8ac85d 100644 --- a/omnibus/config/projects/chef.rb +++ b/omnibus/config/projects/chef.rb @@ -34,7 +34,6 @@ else install_dir "#{default_root}/#{name}" end - if windows? override :'ruby-windows', version: "2.0.0-p645" # Leave dev-kit pinned to 4.5 because 4.7 is 20MB larger and we don't want @@ -43,7 +42,7 @@ if windows? override :'ruby-windows-devkit', version: "4.5.2-20111229-1559" end else - override :ruby, version: "2.1.6" + override :ruby, version: "2.1.6" end override :bundler, version: "1.11.2" @@ -81,5 +80,5 @@ package :msi do wix_light_extension "WixUtilExtension" signing_identity "F74E1A68005E8A9C465C3D2FF7B41F3988F0EA09", machine_store: true parameters ChefLogDllPath: windows_safe_path(gem_path("chef-[0-9]*-mingw32/ext/win32-eventlog/chef-log.dll")), - ProjectLocationDir: project_location_dir + ProjectLocationDir: project_location_dir end |