diff options
| author | Liu <[email protected]> | 2019-12-02 21:32:50 +0800 |
|---|---|---|
| committer | Liu <[email protected]> | 2019-12-02 21:33:15 +0800 |
| commit | 30d4183095aa5dcdb9cbe00b1b48e45ca31424fe (patch) | |
| tree | b8e47b54d84dab64cc9a65e101fcc947e52ea6cc /xmake/modules | |
| parent | 45b739d927c89d93d85f626ab77dee70746c1cd3 (diff) | |
clear tail white space
Diffstat (limited to 'xmake/modules')
| -rw-r--r-- | xmake/modules/detect/tools/find_devenv.lua | 2 | ||||
| -rw-r--r-- | xmake/modules/lib/detect/pkg_config.lua | 6 | ||||
| -rw-r--r-- | xmake/modules/net/ping.lua | 2 | ||||
| -rw-r--r-- | xmake/modules/private/action/require/packagenv.lua | 2 | ||||
| -rw-r--r-- | xmake/modules/ui/app/version.lua | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/xmake/modules/detect/tools/find_devenv.lua b/xmake/modules/detect/tools/find_devenv.lua index ce633e649..5f5bd9de3 100644 --- a/xmake/modules/detect/tools/find_devenv.lua +++ b/xmake/modules/detect/tools/find_devenv.lua @@ -52,7 +52,7 @@ function main(opt) if vcvarsall then for _, vsvars in pairs(vcvarsall) do if vsvars.DevEnvdir and os.isexec(path.join(vsvars.DevEnvdir, "devenv.exe")) then - program = path.join(vsvars.DevEnvdir, "devenv.exe") + program = path.join(vsvars.DevEnvdir, "devenv.exe") end end end diff --git a/xmake/modules/lib/detect/pkg_config.lua b/xmake/modules/lib/detect/pkg_config.lua index 4e766e313..5bc63c18d 100644 --- a/xmake/modules/lib/detect/pkg_config.lua +++ b/xmake/modules/lib/detect/pkg_config.lua @@ -150,7 +150,7 @@ function libinfo(name, opt) for _, flag in ipairs(flags:split('%s')) do -- get links - local link = flag:match("%-l(.*)") + local link = flag:match("%-l(.*)") if link then result.links = result.links or {} table.insert(result.links, link) @@ -158,7 +158,7 @@ function libinfo(name, opt) -- get linkdirs local linkdirs = nil - local linkdir = flag:match("%-L(.*)") + local linkdir = flag:match("%-L(.*)") if linkdir and os.isdir(linkdir) then result.linkdirs = result.linkdirs or {} table.insert(result.linkdirs, linkdir) @@ -166,7 +166,7 @@ function libinfo(name, opt) -- get includedirs local includedirs = nil - local includedir = flag:match("%-I(.*)") + local includedir = flag:match("%-I(.*)") if includedir and os.isdir(includedir) then result.includedirs = result.includedirs or {} table.insert(result.includedirs, includedir) diff --git a/xmake/modules/net/ping.lua b/xmake/modules/net/ping.lua index 0292bbb9b..bdbcd7bc2 100644 --- a/xmake/modules/net/ping.lua +++ b/xmake/modules/net/ping.lua @@ -44,7 +44,7 @@ function main(hosts, opt) -- do not force ping? enable cache local cacheinfo = nil if not opt.force then - cacheinfo = cache.load("net.ping") + cacheinfo = cache.load("net.ping") end -- run tasks diff --git a/xmake/modules/private/action/require/packagenv.lua b/xmake/modules/private/action/require/packagenv.lua index dd95eff7e..466ffd160 100644 --- a/xmake/modules/private/action/require/packagenv.lua +++ b/xmake/modules/private/action/require/packagenv.lua @@ -33,7 +33,7 @@ function _enter_package(package_name, envs, installdir) end -- add the new environments - oldenvs.PATH = os.getenv("PATH") + oldenvs.PATH = os.getenv("PATH") for name, values in pairs(envs) do oldenvs[name] = oldenvs[name] or os.getenv(name) if name == "PATH" then diff --git a/xmake/modules/ui/app/version.lua b/xmake/modules/ui/app/version.lua index 4fd026ec0..03b5254f7 100644 --- a/xmake/modules/ui/app/version.lua +++ b/xmake/modules/ui/app/version.lua @@ -38,7 +38,7 @@ function app:init() self:background_set("blue") -- disable color code output - os.setenv("COLORTERM", "nocolor") + os.setenv("COLORTERM", "nocolor") -- get version info local version = os.iorun("xmake --version") |
