Skip to content
This repository has been archived by the owner on Aug 29, 2018. It is now read-only.

update search path for 'ssh.exe' #743

Merged
merged 1 commit into from Jan 29, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/rhc/commands/git_clone.rb
Expand Up @@ -23,7 +23,7 @@ def run(app_name)

0
else
error "You do not have git installed. In order to fully interact with OpenShift you will need to install and configure a git client.#{RHC::Helpers.windows? ? ' We recommend this free application: Git for Windows - a basic git command line and GUI client http://msysgit.github.io/.' : ''}"
error "You do not have git installed. In order to fully interact with OpenShift you will need to install and configure a git client.#{RHC::Helpers.windows? ? ' We recommend this free application: Git for Windows - a basic git command line and GUI client https://git-for-windows.github.io/.' : ''}"
2
end
end
Expand Down
8 changes: 5 additions & 3 deletions lib/rhc/ssh_helpers.rb
Expand Up @@ -458,12 +458,14 @@ def discover_ssh_executable

#:nocov:
if RHC::Helpers.windows?
# looks for ssh.exe from msysgit or plink.exe from PuTTY, either on path or specific locations
# looks for ssh.exe from git-for-windows or plink.exe from PuTTY, either on path or specific locations
guessing_locations <<
discover_windows_executables do |base|
[
from_files = ENV['PATH'].split(File::PATH_SEPARATOR).map {|p| p + File::ALT_SEPARATOR + 'ssh.exe'}
from_files + [
'ssh.exe',
"#{base}\\Git\\bin\\ssh.exe",
"#{base}\\Git\\usr\\bin\\ssh.exe",
"#{base}\\ssh.exe",
'plink.exe',
"#{base}\\PuTTY\\plink.exe",
Expand Down Expand Up @@ -495,7 +497,7 @@ def discover_ssh_executable
def check_ssh_executable!(path)
if not path
discover_ssh_executable.tap do |ssh_cmd|
raise RHC::InvalidSSHExecutableException.new("No system SSH available. Please use the --ssh option to specify the path to your SSH executable, or install SSH.#{windows? ? ' We recommend this free application: Git for Windows - a basic git command line and GUI client http://msysgit.github.io/.' : ''}") unless ssh_cmd or has_ssh?
raise RHC::InvalidSSHExecutableException.new("No system SSH available. Please use the --ssh option to specify the path to your SSH executable, or install SSH.#{windows? ? ' We recommend this free application: Git for Windows - a basic git command line and GUI client https://git-for-windows.github.io/.' : ''}") unless ssh_cmd or has_ssh?
end
else
bin_path = split_path(path)[0]
Expand Down
2 changes: 1 addition & 1 deletion lib/rhc/wizard.rb
Expand Up @@ -631,7 +631,7 @@ def windows_install

We recommend these free applications:

* Git for Windows - a basic git command line and GUI client http://msysgit.github.io/
* Git for Windows - a basic git command line and GUI client https://git-for-windows.github.io/
* TortoiseGit - git client that integrates into the file explorer http://code.google.com/p/tortoisegit/

EOF
Expand Down