-// Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2019 CEA/DEN, EDF R&D, OPEN CASCADE
//
-// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
-// This library 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 2.1 of the License.
+// This library 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 2.1 of the License, or (at your option) any later version.
//
-// This library 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
-// Lesser General Public License for more details.
+// This library 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
+// Lesser General Public License for more details.
//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
/*
* CommunicationProtocol.cxx :
#ifdef HAS_SSH
#include "CommunicationProtocolSSH.hxx"
#endif
+#ifdef HAS_RSYNC
+ #include "CommunicationProtocolRsync.hxx"
+#endif
#include "APIInternalFailureException.hxx"
#include "RunTimeException.hxx"
#include "Log.hxx"
+#include "Utils.hxx"
using namespace std;
#else
throw RunTimeException("Can't use SSH protocol (SSH tools were "
"not found on the system at compile time).");
+#endif
+ } else if (protocolType == RSYNC) {
+#ifdef HAS_RSYNC
+ static CommunicationProtocolRsync instanceRsync;
+ return instanceRsync;
+#else
+ throw RunTimeException("Can't use RSYNC protocol (RSYNC tools were "
+ "not found on the system at compile time).");
#endif
} else
throw APIInternalFailureException("Unknown communication protocol.");
string CommunicationProtocol::getRemoveSubCommand(const string & path) const
{
+#ifdef WIN32
+ return string("del /s ") + path;
+#else
return string("rm ") + path;
+#endif
+ }
+
+ string CommunicationProtocol::getRemoveDirectorySubCommand(const string & path) const
+ {
+#ifdef WIN32
+ return string("rd /s /q ") + path;
+#else
+ return string("rm -fR ") + path;
+#endif
}
string CommunicationProtocol::getMakeDirectorySubCommand(const string & path) const
{
+#ifdef WIN32
+ return string("md ") + path;
+#else
return string("mkdir -p ") + path;
+#endif
}
int CommunicationProtocol::removeFile(const std::string & path,
return status;
}
+ int CommunicationProtocol::removeDirectory(const std::string & path,
+ const std::string & host,
+ const std::string & user) const
+ {
+ string command = getExecCommand(getRemoveDirectorySubCommand(path), host, user);
+ LOG(command);
+ int status = system(command.c_str());
+ return status;
+ }
+
int CommunicationProtocol::makeDirectory(const std::string & path,
const std::string & host,
const std::string & user) const
// if the argument contains spaces, we surround it with simple quotes (Linux)
// or double quotes (Windows)
- if (commandArgs[i].find(' ') != string::npos) {
+ if (commandArgs[i].find(' ') != string::npos &&
+ !Utils::isOption(commandArgs[i])){
commandStr += string("\"") + commandArgs[i] + "\"";
} else {
commandStr += commandArgs[i];