Fix #4090 Add missing docker envvar

James-Yu · Dec 12, 2023 · 8d5ad8a · 8d5ad8a
1 parent ff147f2
commit 8d5ad8a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/src/compile/recipe.ts b/src/compile/recipe.ts
@@ -13,6 +13,14 @@ const logger = lw.log('Build', 'Recipe')
 let prevRecipe: Recipe | undefined = undefined
 let prevLangId = ''
 
+setDockerImage()
+lw.onConfigChange('docker.image.latex', setDockerImage)
+function setDockerImage() {
+    const dockerImageName: string = vscode.workspace.getConfiguration('latex-workshop').get('docker.image.latex', '')
+    logger.log(`Set $LATEXWORKSHOP_DOCKER_LATEX: ${JSON.stringify(dockerImageName)}`)
+    process.env['LATEXWORKSHOP_DOCKER_LATEX'] = dockerImageName
+}
+
 /**
  * Build LaTeX project using the recipe system. Creates Tools containing the
  * tool info and adds them to the queue. Initiates a buildLoop if there is no

diff --git a/src/utils/logger.ts b/src/utils/logger.ts
@@ -255,7 +255,7 @@ function logConfig() {
             const defaultValue = configuration.inspect(config)?.defaultValue
             const configValue = configuration.get(config)
             if (JSON.stringify(defaultValue) !== JSON.stringify(configValue)) {
-                logTagless(`${config}: ${JSON.stringify(configValue)} .`)
+                logTagless(`[Config] ${config}: ${JSON.stringify(configValue)} .`)
             }
         })
     }
@@ -272,7 +272,7 @@ function logDeprecatedConfig() {
             const defaultValue = configuration.inspect(config)?.defaultValue
             const configValue = configuration.get(config)
             if (JSON.stringify(defaultValue) !== JSON.stringify(configValue)) {
-                logTagless(`Deprecated config ${config} with default value ${JSON.stringify(defaultValue)} is set to ${JSON.stringify(configValue)} at ${workspace?.uri.toString(true)} .`)
+                logTagless(`[Config] Deprecated config ${config} with default value ${JSON.stringify(defaultValue)} is set to ${JSON.stringify(configValue)} at ${workspace?.uri.toString(true)} .`)
                 void vscode.window.showWarningMessage(`Config "${config}" is deprecated. ${getDefaultConfig()[config].deprecationMessage}`)
             }
         })
@@ -287,7 +287,7 @@ function logConfigChange(ev: vscode.ConfigurationChangeEvent) {
             if (ev.affectsConfiguration(config, workspace)) {
                 const configuration = vscode.workspace.getConfiguration(undefined, workspace)
                 const value = configuration.get(config)
-                logTagless(`Configuration changed to { ${config}: ${JSON.stringify(value)} } at ${workspace?.uri.toString(true)} .`)
+                logTagless(`[Config] Configuration changed to { ${config}: ${JSON.stringify(value)} } at ${workspace?.uri.toString(true)} .`)
             }
         })
     }