fix(cli): Do not output ORT_* environment variables unless set

The previous code did always output values for `ORT_CONFIG_DIR` and
`ORT_DATA_DIR` even if these variables were not set, in which case their
internal defaults were shown. This is confusion when dealing with reports
from users, as it is unclear whether these variables were actually set.

Change the code to only show values for these variables if they really
were set, aligning with the behavior for third-party variables shown.

While at it, also show `ORT_TOOLS_DIR` if set.

Signed-off-by: Sebastian Schuberth <[email protected]>

Author: sschuberth

cli/src/main/kotlin/OrtMain.kt

@@ -57,12 +57,9 @@ import org.ossreviewtoolkit.utils.common.expandTilde
 import org.ossreviewtoolkit.utils.common.mebibytes
 import org.ossreviewtoolkit.utils.common.replaceCredentialsInUri
 import org.ossreviewtoolkit.utils.ort.Environment
-import org.ossreviewtoolkit.utils.ort.ORT_CONFIG_DIR_ENV_NAME
 import org.ossreviewtoolkit.utils.ort.ORT_CONFIG_FILENAME
-import org.ossreviewtoolkit.utils.ort.ORT_DATA_DIR_ENV_NAME
 import org.ossreviewtoolkit.utils.ort.ORT_NAME
 import org.ossreviewtoolkit.utils.ort.ortConfigDirectory
-import org.ossreviewtoolkit.utils.ort.ortDataDirectory
 import org.ossreviewtoolkit.utils.ort.printStackTrace
 
 import org.slf4j.LoggerFactory
@@ -207,11 +204,7 @@ class OrtMain : CliktCommand(ORT_NAME) {
             row {
                 val content = mutableListOf("Environment variables:")
 
-                listOf(
-                    ORT_CONFIG_DIR_ENV_NAME to ortConfigDirectory.path,
-                    ORT_DATA_DIR_ENV_NAME to ortDataDirectory.path,
-                    *env.variables.toList().toTypedArray()
-                ).mapTo(content) { (key, value) ->
+                env.variables.mapTo(content) { (key, value) ->
                     val safeValue = value.replaceCredentialsInUri(MaskedString.DEFAULT_MASK)
                     "${Theme.Default.info(key)} = ${Theme.Default.warning(safeValue)}"
                 }

utils/ort/src/main/kotlin/Environment.kt

@@ -99,6 +99,10 @@ data class Environment(
         val ORT_USER_AGENT = "$ORT_NAME/$ORT_VERSION"
 
         private val RELEVANT_VARIABLES = listOf(
+            // ORT variables.
+            ORT_DATA_DIR_ENV_NAME,
+            ORT_CONFIG_DIR_ENV_NAME,
+            ORT_TOOLS_DIR_ENV_NAME,
             // Windows variables.
             "USERPROFILE",
             "OS",