github/textmate
1
1
Fork 0
mirror of https://github.com/textmate/textmate.git synced 2026-04-28 03:00:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Support requirements where existing variable has a space

Browse Source 
For example setting TM_NINJA to “/usr/local/ninja -j6” will use the variable as-is if “/usr/local/ninja” is an executable.
This commit is contained in:
Allan Odgaard
2014-04-04 23:07:10 +07:00
parent 575c31b66f
commit c9a16a6033
1 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Frameworks/bundles/src/wrappers.cc
View File

@@ -79,16 +79,36 @@ namespace bundles
{
std::vector<std::string> candidates;
if(environment.find(requirement.variable) != environment.end())
candidates.push_back(environment[requirement.variable]);
auto envVariable = environment.find(requirement.variable);
if(envVariable != environment.end())
{
auto value = envVariable->second;
auto firstSpace = value.find(" ");
if(firstSpace != std::string::npos)
candidates.push_back(value.substr(0, firstSpace));
candidates.push_back(value);
if(std::find_if(candidates.begin(), candidates.end(), [](std::string const& path){ return path::is_executable(path); }) != candidates.end())
return false;
}
candidates.clear();
for(auto path : search_paths(environment))
candidates.push_back(path::join(path, requirement.command));
auto exe = std::find_if(candidates.begin(), candidates.end(), [](std::string const& path){ return path::is_executable(path); });
if(exe != candidates.end())
{
if(requirement.variable != NULL_STR)
environment[requirement.variable] = *exe;
return false;
}
candidates.clear();
for(auto path : requirement.locations)
candidates.push_back(format_string::expand(path, environment));
auto exe = std::find_if(candidates.begin(), candidates.end(), [](std::string const& path){ return path::is_executable(path); });
exe = std::find_if(candidates.begin(), candidates.end(), [](std::string const& path){ return path::is_executable(path); });
if(exe != candidates.end())
{
if(requirement.variable != NULL_STR)