Merge pull request #260 from jefmathiot/master

Moved to Ruby >=1.9 hash syntax to improve readability
This commit is contained in:
Fabio Rehm 2014-03-21 21:29:53 -03:00
commit 28bd6c87ef
2 changed files with 22 additions and 21 deletions

View file

@ -36,7 +36,8 @@ module Vagrant
opts.separator "" opts.separator ""
opts.separator "Available subcommands:" opts.separator "Available subcommands:"
# https://github.com/mitchellh/vagrant/commit/4194da19c60956f6e59239c0145f772be257e79d # REFACTOR Use @subcommands.keys.sort
# https://github.com/mitchellh/vagrant/commit/4194da19c60956f6e59239c0145f772be257e79d
keys = [] keys = []
@subcommands.each { |key, value| keys << key } @subcommands.each { |key, value| keys << key }

View file

@ -56,26 +56,26 @@ module Vagrant
def commands def commands
[ [
{ :cmd => '/usr/bin/lxc-ls', :args => '' }, { cmd: '/usr/bin/lxc-ls', args: '' },
{ :cmd => '/usr/bin/lxc-info', :args => '' }, { cmd: '/usr/bin/lxc-info', args: '' },
{ :cmd => '/usr/bin/lxc-attach', :args => '' }, { cmd: '/usr/bin/lxc-attach', args: '' },
{ :cmd => '/usr/bin/which', :args => 'lxc-*' }, { cmd: '/usr/bin/which', args: 'lxc-*' },
{ :cmd => '/bin/cat', :args => '/var/lib/lxc/*' }, { cmd: '/bin/cat', args: '/var/lib/lxc/*' },
{ :cmd => '/bin/mkdir', :args => '/var/lib/lxc/*' }, { cmd: '/bin/mkdir', args: '/var/lib/lxc/*' },
{ :cmd => '/bin/su', :args => "root -c sed -e '*' -ibak /var/lib/lxc/*" }, { cmd: '/bin/su', args: "root -c sed -e '*' -ibak /var/lib/lxc/*" },
{ :cmd => '/bin/su', :args => "root -c echo '*' >> /var/lib/lxc/*" }, { cmd: '/bin/su', args: "root -c echo '*' >> /var/lib/lxc/*" },
{ :cmd => '/usr/bin/lxc-start', :args => '-d --name *' }, { cmd: '/usr/bin/lxc-start', args: '-d --name *' },
{ :cmd => '/bin/cp', :args => '%{BOXES}/*/lxc/lxc-template /usr/lib/lxc/templates/*' }, { cmd: '/bin/cp', args: '%{BOXES}/*/lxc/lxc-template /usr/lib/lxc/templates/*' },
{ :cmd => '/bin/cp', :args => '%{BOXES}/*/lxc/lxc-template /usr/share/lxc/templates/*' }, { cmd: '/bin/cp', args: '%{BOXES}/*/lxc/lxc-template /usr/share/lxc/templates/*' },
{ :cmd => '/bin/rm', :args => '/usr/lib/lxc/templates/*' }, { cmd: '/bin/rm', args: '/usr/lib/lxc/templates/*' },
{ :cmd => '/bin/rm', :args => '/usr/share/lxc/templates/*' }, { cmd: '/bin/rm', args: '/usr/share/lxc/templates/*' },
{ :cmd => '/bin/chmod', :args => '+x /usr/lib/lxc/*' }, { cmd: '/bin/chmod', args: '+x /usr/lib/lxc/*' },
{ :cmd => '/bin/chmod', :args => '+x /usr/share/lxc/*' }, { cmd: '/bin/chmod', args: '+x /usr/share/lxc/*' },
{ :cmd => '/usr/bin/lxc-create', :args => '--template * --name * -- --tarball ${BOXES}/*' }, { cmd: '/usr/bin/lxc-create', args: '--template * --name * -- --tarball ${BOXES}/*' },
{ :cmd => '/bin/rm', :args => '-rf /var/lib/lxc/*/rootfs/tmp/*' }, { cmd: '/bin/rm', args: '-rf /var/lib/lxc/*/rootfs/tmp/*' },
{ :cmd => '/usr/bin/lxc-shutdown', :args => '--name *' }, { cmd: '/usr/bin/lxc-shutdown', args: '--name *' },
{ :cmd => '/usr/bin/lxc-stop', :args => '--name *' }, { cmd: '/usr/bin/lxc-stop', args: '--name *' },
{ :cmd => '/usr/bin/lxc-destroy', :args => '--name *' } { cmd: '/usr/bin/lxc-destroy', args: '--name *' }
] ]
end end
end end