diff options
Diffstat (limited to 'go/task_runner')
| -rw-r--r-- | go/task_runner/tasks.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/go/task_runner/tasks.go b/go/task_runner/tasks.go index a8d217f3..f1adb2c5 100644 --- a/go/task_runner/tasks.go +++ b/go/task_runner/tasks.go @@ -26,7 +26,6 @@ func run_r_script(name string, args []string) error { cmd := exec.Command("Rscript", "--vanilla", filepath.Join(rpath, fmt.Sprintf("%s.R", name)), workdate, dealname+","+reinvflag) cmd.Dir = rpath - cmd.Env = os.Environ() if f, err := os.OpenFile(filepath.Join(logpath, fmt.Sprintf("%s.Rout", name)), os.O_APPEND|os.O_WRONLY|os.O_CREATE, 0600); err != nil { return err @@ -40,13 +39,15 @@ func run_r_script(name string, args []string) error { } func run_python_script(name string, args []string) error { - cmd := exec.Command(fmt.Sprintf("python %s.py", name), args...) + var python_path string if val, ok := os.LookupEnv("CODE_DIR"); ok { python_path = filepath.Join(val, "python") } else { return errors.New("CODE_DIR environment variable not set.") } + args = append([]string{filepath.Join(python_path, name)}, args...) + cmd := exec.Command("python", args...) cmd.Dir = python_path return cmd.Run() } @@ -59,6 +60,6 @@ var tasks = map[string]func([]string) error{ return run_r_script("build_scenarios", args) }, "generate_scenarios": func(args []string) error { - return run_python_script(filepath.Join("intex", "intex_scenarios"), args) + return run_python_script(filepath.Join("intex", "intex_scenarios.py"), args) }, } |