Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use IGN_LAUNCH_CONFIG_PATH #131

Merged
merged 1 commit into from
Sep 29, 2021
Merged

Use IGN_LAUNCH_CONFIG_PATH #131

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 31 additions & 7 deletions src/cmd/launch_main.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,16 +76,40 @@ void runLaunchCommand(const LaunchOptions &_opt)
{
cmdVerbosity(_opt.verboseLevel);

if (!_opt.launchfile.empty())
std::string launchfile = _opt.launchfile;
if (!launchfile.empty())
{
if (!ignition::common::isFile(_opt.launchfile))
// If the launch file is not a file, then look in the paths set by the
// IGN_LAUNCH_CONFIG_PATH environment variable.
if (!ignition::common::isFile(launchfile))
{
ignerr << "File [" + _opt.launchfile + "] does not exists"
<< std::endl;
exit(-1);
std::string configPathEnv;
ignition::common::env("IGN_LAUNCH_CONFIG_PATH", configPathEnv, true);
if (!configPathEnv.empty())
{
std::vector<std::string> paths =
ignition::common::split(configPathEnv, ":");
for (const std::string &path : paths)
{
std::string filePath =
ignition::common::joinPaths(path, launchfile);
if (ignition::common::isFile(filePath))
{
launchfile = filePath;
break;
}
}
}

if (!ignition::common::isFile(launchfile))
{
ignerr << "File [" + launchfile + "] does not exists"
<< std::endl;
exit(-1);
}
}

std::string cmd = "erb -v ";
std::string cmd = "erb ";
for (auto & arg : _opt.more_comms)
{
auto tokens = ignition::common::split(arg, ":=");
Expand All @@ -100,7 +124,7 @@ void runLaunchCommand(const LaunchOptions &_opt)
exit(1);
}
}
cmd += " " + _opt.launchfile;
cmd += " " + launchfile;
std::string config = erbExec(cmd);
run(config.c_str());
return;
Expand Down