pinokiod 7.5.34 → 7.5.35

package/kernel/bin/conda.js

@@ -118,6 +118,7 @@ function windowsCondaActivatePatchedBlock(eol) {
 function windowsCondaActivatePatchRoutines(eol) {
   return [
     ":PINOKIO_APPLY_CONDA_ENV",
+    "@ECHO OFF",
     '@FOR /F "tokens=1,* delims==" %%A IN (%~1) DO (',
     '@IF "%CONDA_DEBUG%" == "1" ECHO DEBUG: "%%A=%%B">&2',
     '@IF "%%A"=="_CONDA_SCRIPT" (',
@@ -125,6 +126,7 @@ function windowsCondaActivatePatchRoutines(eol) {
     '@ECHO ERROR: Activation script "%%B" failed with code %ERRORLEVEL%.>&2',
     '@CALL :DELETE "%~1"',
     '@CALL :DELETE "%~2"',
+    "@ECHO ON",
     "@EXIT /B 4",
     ")",
     ') ELSE IF "%%B"=="" (',
@@ -135,6 +137,7 @@ function windowsCondaActivatePatchRoutines(eol) {
     ")",
     '@CALL :DELETE "%~1"',
     '@CALL :DELETE "%~2"',
+    "@ECHO ON",
     "@EXIT /B 0",
     "",
   ].join(eol)
@@ -245,20 +248,35 @@ class Conda {
       }
       throw error
     }
+    const eol = content.includes("\r\n") ? "\r\n" : "\n"
+    const routineAnchor = `${eol}:: Routine to delete a temp file if CONDA_DEBUG is not set`
+    if (!content.includes(routineAnchor)) {
+      console.warn("Could not patch Conda CMD activation echo leak; missing _conda_activate.bat routine anchor")
+      return
+    }
     if (content.includes(WINDOWS_CONDA_ACTIVATE_PINOKIO_MARKER)) {
+      if (content.includes(`${WINDOWS_CONDA_ACTIVATE_PINOKIO_MARKER}${eol}@ECHO OFF`)) {
+        return
+      }
+      const routineStart = content.indexOf(WINDOWS_CONDA_ACTIVATE_PINOKIO_MARKER)
+      const routineAnchorIndex = content.indexOf(routineAnchor, routineStart)
+      if (routineAnchorIndex < 0) {
+        console.warn("Could not update Conda CMD activation echo patch; missing _conda_activate.bat routine anchor")
+        return
+      }
+      const patched = [
+        content.slice(0, routineStart),
+        windowsCondaActivatePatchRoutines(eol),
+        content.slice(routineAnchorIndex + eol.length),
+      ].join("")
+      await fs.promises.writeFile(activatePath, patched)
       return
     }
-    const eol = content.includes("\r\n") ? "\r\n" : "\n"
     const originalBlock = windowsCondaActivateOriginalBlock(eol)
     if (!content.includes(originalBlock)) {
       console.warn("Could not patch Conda CMD activation echo leak; unexpected _conda_activate.bat")
       return
     }
-    const routineAnchor = `${eol}:: Routine to delete a temp file if CONDA_DEBUG is not set`
-    if (!content.includes(routineAnchor)) {
-      console.warn("Could not patch Conda CMD activation echo leak; missing _conda_activate.bat routine anchor")
-      return
-    }
     const patched = content
       .replace(originalBlock, windowsCondaActivatePatchedBlock(eol))
       .replace(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "7.5.34",
+  "version": "7.5.35",
   "description": "",
   "main": "index.js",
   "scripts": {

package/test/conda-bin.test.js

@@ -275,11 +275,43 @@ test('Conda init patches Windows CMD activation echo leak idempotently', async (
   assert.equal(await fs.readFile(activatePath, 'utf8'), patched)
   assert.equal(patched.includes(WINDOWS_CONDA_ACTIVATE_ORIGINAL_BLOCK), false)
   assert.match(patched, /ENDLOCAL & @CALL :PINOKIO_APPLY_CONDA_ENV "%%T" "%__conda_tmp%" & @GOTO :EOF/)
-  assert.match(patched, /:PINOKIO_APPLY_CONDA_ENV/)
+  assert.match(patched, /:PINOKIO_APPLY_CONDA_ENV\r\n@ECHO OFF/)
   assert.match(patched, /@CALL "%%B" \|\| \(/)
+  assert.match(patched, /@ECHO ON\r\n@EXIT \/B 0/)
   assert.match(patched, /:: Routine to delete a temp file if CONDA_DEBUG is not set/)
 })
 
+test('Conda init updates the earlier Windows CMD activation echo patch', async () => {
+  const root = await fs.mkdtemp(path.join(os.tmpdir(), 'pinokio-conda-cmd-activate-update-patch-'))
+  await fs.mkdir(path.join(root, 'bin', 'miniforge', 'conda-meta'), { recursive: true })
+  const oldPatch = WINDOWS_CONDA_ACTIVATE_SCRIPT
+    .replace(
+      WINDOWS_CONDA_ACTIVATE_ORIGINAL_BLOCK,
+      '    ) ELSE ENDLOCAL & @CALL :PINOKIO_APPLY_CONDA_ENV "%%T" "%__conda_tmp%" & @GOTO :EOF'
+    )
+    .replace(
+      '\r\n:: Routine to delete a temp file if CONDA_DEBUG is not set',
+      [
+        '\r\n:PINOKIO_APPLY_CONDA_ENV',
+        '@FOR /F "tokens=1,* delims==" %%A IN (%~1) DO (',
+        '@IF "%CONDA_DEBUG%" == "1" ECHO DEBUG: "%%A=%%B">&2',
+        ')',
+        '@CALL :DELETE "%~1"',
+        '@CALL :DELETE "%~2"',
+        '@EXIT /B 0',
+        ':: Routine to delete a temp file if CONDA_DEBUG is not set',
+      ].join('\r\n')
+    )
+  const activatePath = await seedWindowsCondaActivateScript(root, oldPatch)
+  const conda = createConda(createKernel(root))
+
+  await conda.init()
+
+  const patched = await fs.readFile(activatePath, 'utf8')
+  assert.match(patched, /:PINOKIO_APPLY_CONDA_ENV\r\n@ECHO OFF/)
+  assert.match(patched, /@ECHO ON\r\n@EXIT \/B 0/)
+})
+
 test('Conda init leaves unexpected Windows CMD activation script unchanged', async () => {
   const root = await fs.mkdtemp(path.join(os.tmpdir(), 'pinokio-conda-cmd-activate-unexpected-'))
   await fs.mkdir(path.join(root, 'bin', 'miniforge', 'conda-meta'), { recursive: true })