asfgit closed pull request #28: Add support for detecting and using of KiTTY's
klink.exe and kscp.exe
URL: https://github.com/apache/maven-wagon/pull/28
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/wagon-providers/wagon-ssh-external/src/main/java/org/apache/maven/wagon/providers/ssh/external/ScpExternalWagon.java
b/wagon-providers/wagon-ssh-external/src/main/java/org/apache/maven/wagon/providers/ssh/external/ScpExternalWagon.java
index e6aadfa9..b2b665a2 100644
---
a/wagon-providers/wagon-ssh-external/src/main/java/org/apache/maven/wagon/providers/ssh/external/ScpExternalWagon.java
+++
b/wagon-providers/wagon-ssh-external/src/main/java/org/apache/maven/wagon/providers/ssh/external/ScpExternalWagon.java
@@ -217,7 +217,8 @@ public Streams executeCommand( String command, boolean
ignoreFailures )
protected boolean isPuTTY()
{
- return sshExecutable.toLowerCase( Locale.ENGLISH ).contains( "plink" );
+ String exe = sshExecutable.toLowerCase( Locale.ENGLISH );
+ return exe.contains( "plink" ) || exe.contains( "klink" );
}
private Commandline createBaseCommandLine( boolean putty, String
executable, File privateKey )
@@ -336,7 +337,8 @@ private void executeScpCommand( Resource resource, File
localFile, boolean put )
boolean isPuTTYSCP()
{
- return scpExecutable.toLowerCase( Locale.ENGLISH ).contains( "pscp" );
+ String exe = scpExecutable.toLowerCase( Locale.ENGLISH );
+ return exe.contains( "pscp" ) || exe.contains( "kscp" );
}
private String normalizeResource( Resource resource )
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
