tmp_outdir_prefix defaults to tmpdir_prefix

Author: mr-c

cwltool/argparser.py

@@ -112,16 +112,22 @@ def arg_parser() -> argparse.ArgumentParser:
     parser.add_argument(
         "--tmpdir-prefix",
         type=str,
-        help="Path prefix for temporary directories",
+        help="Path prefix for temporary directories. If --tmpdir-prefix is not "
+        "provided, then the prefix for temporary directories is influenced by "
+        "the value of the TMPDIR, TEMP, or TMP environment variables. Taking "
+        "those into consideration, the current default is {}.".format(
+            DEFAULT_TMP_PREFIX
+        ),
         default=DEFAULT_TMP_PREFIX,
     )
 
     exgroup = parser.add_mutually_exclusive_group()
     exgroup.add_argument(
         "--tmp-outdir-prefix",
         type=str,
-        help="Path prefix for intermediate output directories",
-        default=DEFAULT_TMP_PREFIX,
+        help="Path prefix for intermediate output directories. Defaults to the "
+        "value of --tmpdir-prefix.",
+        default="",
     )
 
     exgroup.add_argument(

cwltool/context.py

@@ -96,7 +96,7 @@ def __init__(self, kwargs: Optional[Dict[str, Any]] = None) -> None:
         self.use_container = True  # type: bool
         self.force_docker_pull = False  # type: bool
 
-        self.tmp_outdir_prefix = DEFAULT_TMP_PREFIX  # type: str
+        self.tmp_outdir_prefix = ""  # type: str
         self.tmpdir_prefix = DEFAULT_TMP_PREFIX  # type: str
         self.tmpdir = ""  # type: str
         self.rm_tmpdir = True  # type: bool
@@ -149,6 +149,8 @@ def __init__(self, kwargs: Optional[Dict[str, Any]] = None) -> None:
         self.default_stdout = None  # type: Optional[Union[IO[bytes], TextIO]]
         self.default_stderr = None  # type: Optional[Union[IO[bytes], TextIO]]
         super(RuntimeContext, self).__init__(kwargs)
+        if self.tmp_outdir_prefix == "":
+            self.tmp_outdir_prefix = self.tmpdir_prefix
 
     def get_outdir(self) -> str:
         """Return self.outdir or create one with self.tmp_outdir_prefix."""