X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMover.cpp;h=16d225bfa700333441fa647aace9c3872aa27eb8;hb=bfe98181169d9e697e515da974d9b6a15a06c940;hp=4837350830e3778e572221e6f9d82d2d300337fa;hpb=77ac196f64a69451fd863b954f33e5556fd95ba6;p=lyx.git

diff --git a/src/Mover.cpp b/src/Mover.cpp
index 4837350830..16d225bfa7 100644
--- a/src/Mover.cpp
+++ b/src/Mover.cpp
@@ -12,9 +12,9 @@
 
 #include "Mover.h"
 
+#include "support/FileName.h"
 #include "support/filetools.h"
 #include "support/lstrings.h"
-#include "support/lyxlib.h"
 #include "support/Systemcall.h"
 
 #include <fstream>
@@ -28,28 +28,28 @@ namespace lyx {
 
 bool Mover::copy(FileName const & from, FileName const & to) const
 {
-	return do_copy(from, to, to.absFilename());
+	return do_copy(from, to, to.absFileName());
 }
 
 
 bool Mover::do_copy(FileName const & from, FileName const & to,
 		    string const &) const
 {
-	return from.copyTo(to, true);
+	return from.copyTo(to);
 }
 
 
 bool Mover::rename(FileName const & from,
 		   FileName const & to) const
 {
-	return do_rename(from, to, to.absFilename());
+	return do_rename(from, to, to.absFileName());
 }
 
 
 bool Mover::do_rename(FileName const & from, FileName const & to,
 		      string const &) const
 {
-	return from.renameTo(to);
+	return from.moveTo(to);
 }
 
 
@@ -59,10 +59,11 @@ bool SpecialisedMover::do_copy(FileName const & from, FileName const & to,
 	if (command_.empty())
 		return Mover::do_copy(from, to, latex);
 
-	string command = libScriptSearch(command_);
+	string command = command_;
 	command = subst(command, "$$i", quoteName(from.toFilesystemEncoding()));
 	command = subst(command, "$$o", quoteName(to.toFilesystemEncoding()));
 	command = subst(command, "$$l", quoteName(latex));
+	command = subst(command, "$${python}", os::python());
 
 	Systemcall one;
 	return one.startscript(Systemcall::Wait, command) == 0;