darktable/lua-scripts-w-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #115 from wpferguson/dtutils_file_fix

Browse Source 
check_if_[bin|file]_exist fixes
This commit is contained in:
supertobi
2018-03-17 10:24:24 +01:00
committed by GitHub
parent 7e57f61947 5266aa7547
commit 3051eddd2e
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/dtutils/file.lua
View File

@@ -66,13 +66,12 @@ function dtutils_file.check_if_bin_exists(bin)
if string.len(path) > 0 then
if dtutils_file.check_if_file_exists(path) then
path = "\"" .. path .. "\""
if (string.match(path, ".exe\"$") or string.match(path, ".EXE\"$")) and dt.configuration.running_os ~= "windows" then
result = "wine " .. path
if (string.match(path, ".exe$") or string.match(path, ".EXE$")) and dt.configuration.running_os ~= "windows" then
result = "wine " .. "\"" .. path .. "\""
elseif dt.configuration.running_os == "macos" then
result = "open -a -W " .. path
result = "open -W -a " .. "\"" .. path .. "\""
else
result = path
result = "\"" .. path .. "\""
end
end
elseif dt.configuration.running_os == "linux" then
@@ -222,16 +221,15 @@ dtutils_file.libdoc.functions["check_if_file_exists"] = {
}
function dtutils_file.check_if_file_exists(filepath)
filepath = "\"" .. filepath .. "\""
local result
if (dt.configuration.running_os == 'windows') then
filepath = string.gsub(filepath, '[\\/]+', '\\')
result = os.execute('if exist '..filepath..' (cmd /c exit 0) else (cmd /c exit 1)')
result = os.execute('if exist "'..filepath..'" (cmd /c exit 0) else (cmd /c exit 1)')
if not result then
result = false
end
elseif (dt.configuration.running_os == "linux") then
result = os.execute('test -e ' .. filepath)
result = os.execute('test -e ' .. "\"" .. filepath .. "\"")
if not result then
result = false
end
@@ -533,4 +531,4 @@ function dtutils_file.executable_path_widget(executables)
return box
end
return dtutils_file
return dtutils_file