Archives/ohwgiles_laminar
1
0
Fork 0
mirror of https://github.com/ohwgiles/laminar.git synced 2026-11-03 00:54:44 +00:00
Code Issues Projects Releases Wiki Activity

allow Run::addScript to accept a CWD for scripts

Browse Source
This commit is contained in:
Oliver Giles
2017-08-07 08:06:49 +03:00
parent ae213b4f74
commit 4fc2310ed9
3 changed files with 28 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/run.cpp
View File

@@ -59,7 +59,7 @@ std::string Run::reason() const {
}
bool Run::step() {
if(!currentScript.empty() && procStatus != 0)
if(!currentScript.path.empty() && procStatus != 0)
result = RunState::FAILED;
if(scripts.size()) {
@@ -87,7 +87,7 @@ bool Run::step() {
PATH.append(p);
}
chdir(wd.c_str());
chdir(currentScript.cwd.c_str());
for(std::string file : env) {
StringMap vars = parseConfFile(file.c_str());
@@ -108,14 +108,14 @@ bool Run::step() {
for(auto& pair : params) {
setenv(pair.first.c_str(), pair.second.c_str(), false);
}
fprintf(stderr, "[laminar] Executing %s\n", currentScript.c_str());
execl(currentScript.c_str(), currentScript.c_str(), NULL);
fprintf(stderr, "[laminar] Executing %s\n", currentScript.path.c_str());
execl(currentScript.path.c_str(), currentScript.path.c_str(), NULL);
// cannot use LLOG because stdout/stderr are captured
fprintf(stderr, "[laminar] Failed to execute %s\n", currentScript.c_str());
fprintf(stderr, "[laminar] Failed to execute %s\n", currentScript.path.c_str());
_exit(1);
}
LLOG(INFO, "Forked", currentScript, pid);
LLOG(INFO, "Forked", currentScript.path, currentScript.cwd, pid);
close(pfd[1]);
fd = pfd[0];
this->pid = pid;
@@ -125,8 +125,8 @@ bool Run::step() {
return true;
}
}
void Run::addScript(std::string script) {
scripts.push(script);
void Run::addScript(std::string scriptPath, std::string scriptWorkingDir) {
scripts.push({scriptPath, scriptWorkingDir});
}
void Run::addEnv(std::string path) {
env.push_back(path);