beenull/SparkleShare
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

linux: Fix build

Browse source
This commit is contained in:
Hylke Bons 2017-04-15 08:37:16 +01:00
parent c696b3c412
commit 9c14020d43
2 changed files with 35 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Sparkles/Makefile.am
View file

@ -18,6 +18,7 @@ SOURCES = \
Logger.cs \
Preset.cs \
SSHAuthenticationInfo.cs \
SSHCommand.cs \
SSHFetcher.cs \
TcpListener.cs \
User.cs \

43
Sparkles/SSHCommand.cs
View file

@ -1,32 +1,57 @@
using System.IO;
// SparkleShare, a collaboration and sharing tool.
// Copyright (C) 2010 Hylke Bons <hylkebons@gmail.com>
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as
// published by the Free Software Foundation, either version 3 of the
// License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
using System.IO;
namespace Sparkles {
public class SSHCommand : Command
{
public static string SSHPath = "";
public static string SSHCommandPath {
get {
return Path.Combine(SSHPath, "ssh").Replace("\\", "/");
}
}
public SSHCommand(string command, string args) : this (command, args, null) {
public SSHCommand(string command, string args) : this (command, args, null)
{
}
public SSHCommand(string command, string args, SSHAuthenticationInfo auth_info) : base (Path.Combine(SSHPath, command), args) {
public SSHCommand(string command, string args, SSHAuthenticationInfo auth_info) :
base (Path.Combine (SSHPath, command), args)
{
string GIT_SSH_COMMAND = SSHPath;
if (auth_info != null)
GIT_SSH_COMMAND = FormatGitSSHCommand(auth_info);
GIT_SSH_COMMAND = FormatGitSSHCommand (auth_info);
SetEnvironmentVariable("GIT_SSH_COMMAND", GIT_SSH_COMMAND);
SetEnvironmentVariable ("GIT_SSH_COMMAND", GIT_SSH_COMMAND);
}
public static string FormatGitSSHCommand(SSHAuthenticationInfo auth_info)
public static string FormatGitSSHCommand (SSHAuthenticationInfo auth_info)
{
return SSHCommandPath + " " +
"-i " + auth_info.PrivateKeyFilePath.Replace("\\" , "/").Replace(" ", "\\ ") + " " +
"-o UserKnownHostsFile=" + auth_info.KnownHostsFilePath.Replace("\\", "/").Replace(" ", "\\ ") + " " +
return SSHCommandPath + " " +
"-i " + auth_info.PrivateKeyFilePath.Replace ("\\" , "/").Replace (" ", "\\ ") + " " +
"-o UserKnownHostsFile=" + auth_info.KnownHostsFilePath.Replace ("\\", "/").Replace (" ", "\\ ") + " " +
"-o IdentitiesOnly=yes" + " " + // Don't fall back to other keys on the system
"-o PasswordAuthentication=no" + " " + // Don't hang on possible password prompts
"-F /dev/null"; // Ignore the system's SSH config file