From d355095e16a66e0d4f1b580777959165b20aaaeb Mon Sep 17 00:00:00 2001 From: supertobi Date: Mon, 15 Apr 2019 15:27:53 +0200 Subject: [PATCH 1/2] file.lua copy for windows --- lib/dtutils/file.lua | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/dtutils/file.lua b/lib/dtutils/file.lua index 69243e9..90fdf08 100644 --- a/lib/dtutils/file.lua +++ b/lib/dtutils/file.lua @@ -291,9 +291,13 @@ dtutils_file.libdoc.functions["file_copy"] = { function dtutils_file.file_copy(fromFile, toFile) local result = nil -- if cp exists, use it - if dtutils_file.check_if_bin_exists("cp") then + if dt.configuration.running_os == "windows" then + os.execute('copy "' .. fromFile .. '" "' .. toFile .. '"') + result = true + elseif dtutils_file.check_if_bin_exists("cp") then result = os.execute("cp '" .. fromFile .. "' '" .. toFile .. "'") end + -- if cp was not present, or if cp failed, then a pure lua solution if not result then local fileIn, err = io.open(fromFile, 'rb') From cadd98dc59358c5eb573bd617e61de9c4481dba9 Mon Sep 17 00:00:00 2001 From: supertobi Date: Tue, 16 Apr 2019 10:58:32 +0200 Subject: [PATCH 2/2] dtutils_file.file_copy: use the result --- lib/dtutils/file.lua | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/dtutils/file.lua b/lib/dtutils/file.lua index 90fdf08..f4306ff 100644 --- a/lib/dtutils/file.lua +++ b/lib/dtutils/file.lua @@ -292,8 +292,7 @@ function dtutils_file.file_copy(fromFile, toFile) local result = nil -- if cp exists, use it if dt.configuration.running_os == "windows" then - os.execute('copy "' .. fromFile .. '" "' .. toFile .. '"') - result = true + result = os.execute('copy "' .. fromFile .. '" "' .. toFile .. '"') elseif dtutils_file.check_if_bin_exists("cp") then result = os.execute("cp '" .. fromFile .. "' '" .. toFile .. "'") end