From d6e43d3197a34cf182a2fbd3e696f3daf8bf45a4 Mon Sep 17 00:00:00 2001 From: Brian Cain Date: Wed, 5 Sep 2018 11:00:45 -0700 Subject: [PATCH 1/3] Include winrm locales --- plugins/commands/powershell/plugin.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/commands/powershell/plugin.rb b/plugins/commands/powershell/plugin.rb index 325925115..0bd0e1bd7 100644 --- a/plugins/commands/powershell/plugin.rb +++ b/plugins/commands/powershell/plugin.rb @@ -22,6 +22,7 @@ module VagrantPlugins def self.init! return if defined?(@_init) I18n.load_path << File.expand_path("templates/locales/command_ps.yml", Vagrant.source_root) + I18n.load_path << File.expand_path("templates/locales/comm_winrm.yml", Vagrant.source_root) I18n.reload! @_init = true end From b1a0fa628f47f704a582534a0ce670b8ce70cdab Mon Sep 17 00:00:00 2001 From: Brian Cain Date: Wed, 5 Sep 2018 12:56:17 -0700 Subject: [PATCH 2/3] Add subcommand docstring to powershell --- plugins/commands/powershell/command.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/plugins/commands/powershell/command.rb b/plugins/commands/powershell/command.rb index 54bd74962..c10edbd82 100644 --- a/plugins/commands/powershell/command.rb +++ b/plugins/commands/powershell/command.rb @@ -16,6 +16,9 @@ module VagrantPlugins opts = OptionParser.new do |o| o.banner = "Usage: vagrant powershell [-- extra powershell args]" + o.separator "" + o.separator "Opens a remote PowerShell session to the machine if it" + o.separator "supports powershell remoting." o.separator "" o.separator "Options:" o.separator "" From c3c65a379305fcc1cc6fc14600d6a2ddee3397a6 Mon Sep 17 00:00:00 2001 From: Brian Cain Date: Wed, 5 Sep 2018 13:26:22 -0700 Subject: [PATCH 3/3] Fixup docs and website wording for command --- plugins/commands/powershell/command.rb | 4 ++-- website/source/docs/cli/powershell.html.md | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/plugins/commands/powershell/command.rb b/plugins/commands/powershell/command.rb index c10edbd82..ad1f1612f 100644 --- a/plugins/commands/powershell/command.rb +++ b/plugins/commands/powershell/command.rb @@ -17,8 +17,8 @@ module VagrantPlugins o.banner = "Usage: vagrant powershell [-- extra powershell args]" o.separator "" - o.separator "Opens a remote PowerShell session to the machine if it" - o.separator "supports powershell remoting." + o.separator "Opens a PowerShell session on the host to the guest" + o.separator "machine if both support powershell remoting." o.separator "" o.separator "Options:" o.separator "" diff --git a/website/source/docs/cli/powershell.html.md b/website/source/docs/cli/powershell.html.md index 422112687..c1931cfc5 100644 --- a/website/source/docs/cli/powershell.html.md +++ b/website/source/docs/cli/powershell.html.md @@ -11,10 +11,11 @@ description: |- **Command: `vagrant powershell`** -This will open a PowerShell prompt into a running Vagrant machine. +This will open a PowerShell prompt on the host into a running Vagrant guest machine. -This command will only work if the machine supports PowerShell. Not every -environment will support PowerShell. +This command will only work if the machines supports PowerShell. Not every +environment will support PowerShell. At the moment, only Windows is supported +with this command. ## Options