Merge pull request #1558 from stonebig/master

stonebig · web-flow · commit e874d0b41435 · 2025-04-17T21:53:20.000+02:00
simplify further tools plumbery
diff --git a/make.py b/make.py
@@ -133,13 +133,13 @@ def _get_installed_tools_markdown(self) -> str:
         tool_lines = []
 
         if (nodejs_path := self.winpython_directory / NODEJS_RELATIVE_PATH).exists():
-            version = utils.get_nodejs_version(nodejs_path)
-            tool_lines.append(f"[Nodejs](https://nodejs.org) | {version} | a JavaScript runtime built on Chrome's V8 JavaScript engine")
-            version = utils.get_npmjs_version(nodejs_path)
+            version = utils.exec_shell_cmd("node -v", nodejs_path).splitlines()[0]
+            tool_lines.append(f"[Nodejs](https://nodejs.org) | {version} | xa JavaScript runtime built on Chrome's V8 JavaScript engine")
+            version = utils.exec_shell_cmd("npm -v", nodejs_path).splitlines()[0]
             tool_lines.append(f"[npmjs](https://www.npmjs.com) | {version} | a package manager for JavaScript")
 
         if (pandoc_exe := self.winpython_directory / "t" / "pandoc.exe").exists():
-            version = utils.get_pandoc_version(str(pandoc_exe.parent))
+            version = utils.exec_shell_cmd("pandoc -v", pandoc_exe.parent).splitlines()[0].split(" ")[-1]
             tool_lines.append(f"[Pandoc](https://pandoc.org) | {version} | an universal document converter")
 
         if vscode_exe := (self.winpython_directory / "t" / "VSCode" / "Code.exe").exists():
diff --git a/winpython/utils.py b/winpython/utils.py
@@ -166,18 +166,6 @@ def exec_run_cmd(args, path=None):
     process = subprocess.run(args, capture_output=True, cwd=path, text=True)
     return process.stdout
 
-def get_nodejs_version(path):
-    """Return version of the Nodejs installed in *path*."""
-    return exec_shell_cmd("node -v", path).splitlines()[0]
-
-def get_npmjs_version(path):
-    """Return version of the Nodejs installed in *path*."""
-    return exec_shell_cmd("npm -v", path).splitlines()[0]
-
-def get_pandoc_version(path):
-    """Return version of the Pandoc executable in *path*."""
-    return exec_shell_cmd("pandoc -v", path).splitlines()[0].split(" ")[-1]
-
 def python_query(cmd, path):
     """Execute Python command using the Python interpreter located in *path*."""
     the_exe = get_python_executable(path)
