diff --git a/src/plugins/remotelinux/rsyncdeploystep.cpp b/src/plugins/remotelinux/rsyncdeploystep.cpp index b182a7ec47..4a6962061f 100644 --- a/src/plugins/remotelinux/rsyncdeploystep.cpp +++ b/src/plugins/remotelinux/rsyncdeploystep.cpp @@ -159,11 +159,13 @@ void RsyncDeployService::deployNextFile() } const DeployableFile file = m_deployableFiles.takeFirst(); const RsyncCommandLine cmdLine = RsyncDeployStep::rsyncCommand(*connection(), m_flags); + QString lf = file.localFilePath().toString(); + lf = "/cygdrive/" + lf.at(0) + lf.mid(2); const QStringList args = QStringList(cmdLine.options) - << (file.localFilePath().toString() + (file.localFilePath().isDir() ? "/" : QString())) + << (lf + (file.localFilePath().isDir() ? "/" : QString())) << (cmdLine.remoteHostSpec + ':' + file.remoteFilePath()); + qDebug() << args; m_rsync.start("rsync", args); // TODO: Get rsync location from settings? } void RsyncDeployService::setFinished() @@ -231,7 +233,7 @@ RsyncCommandLine RsyncDeployStep::rsyncCommand(const SshConnection &sshConnectio { const QString sshCmdLine = QtcProcess::joinArgs( QStringList{SshSettings::sshFilePath().toUserOutput()} - << sshConnection.connectionOptions(SshSettings::sshFilePath())); + << sshConnection.connectionOptions(SshSettings::sshFilePath()), OsTypeLinux); const SshConnectionParameters sshParams = sshConnection.connectionParameters(); return RsyncCommandLine(QStringList{"-e", sshCmdLine, flags}, sshParams.userName() + '@' + sshParams.host());