Use /bin/bash instead of /bin/sh to fix running in ubuntu

DataCanvasIO · May 17, 2022 · 7ce66be · 7ce66be
1 parent 3440cf0
commit 7ce66be
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/tsbenchmark/benchmark.py b/tsbenchmark/benchmark.py
@@ -301,7 +301,7 @@ def make_run_requirements_conda_yaml_command(self, working_dir_path, player):
 
     def get_command_prefix(self):
         runpy_script = (HERE / "runpy.sh").absolute().as_posix()
-        return f"/bin/sh -x {runpy_script}"
+        return f"/bin/bash -x {runpy_script}"
 
     def get_exec_py_args(self, working_dir_path, player):
         player_exec_file = player.abs_exec_file_path().as_posix()
@@ -349,7 +349,7 @@ def make_run_requirements_conda_yaml_command(self, working_dir_path, player):
         return command
 
     def get_command_prefix(self):
-        return f"/bin/sh -x  resources/runpy.sh"
+        return f"/bin/bash -x  resources/runpy.sh"
 
     def get_exec_py_args(self, working_dir_path, player):
         remote_player_exec_file = (working_dir_path / "resources" / player.name / player.exec_file).as_posix()

diff --git a/tsbenchmark/runpy.sh b/tsbenchmark/runpy.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # unset https_proxy
 # unset http_proxy

diff --git a/tsbenchmark/tests/test_runpy.py b/tsbenchmark/tests/test_runpy.py
@@ -31,7 +31,7 @@ def test_conda_yaml_env():
     print(f"generated env file path: {conda_env_yaml_file}")
 
     py_path = PWD / "runpy" / "conda_yaml" / "validate.py"
-    command = f"/bin/sh -x {runpy_file_path} --conda-home={conda_home} --venv-kind={PythonEnv.KIND_CONDA}" \
+    command = f"/bin/bash -x {runpy_file_path} --conda-home={conda_home} --venv-kind={PythonEnv.KIND_CONDA}" \
               f" --requirements-kind={PythonEnv.REQUIREMENTS_CONDA_YAML} " \
               f" --venv-name={env_name} --requirements-yaml-file={conda_env_yaml_file}" \
               f" --python-script={py_path.as_posix()}"