From fbf7f3074fc54eb9b2a991e8adda686d0318701e Mon Sep 17 00:00:00 2001 From: Ruben Romero Montes Date: Wed, 23 Jul 2025 17:46:02 +0200 Subject: [PATCH] fix: manifest dir as working directory Signed-off-by: Ruben Romero Montes --- .../exhort/providers/JavaScriptNpmProvider.java | 16 +--------------- .../exhort/providers/JavaScriptProvider.java | 13 +++---------- 2 files changed, 4 insertions(+), 25 deletions(-) diff --git a/src/main/java/com/redhat/exhort/providers/JavaScriptNpmProvider.java b/src/main/java/com/redhat/exhort/providers/JavaScriptNpmProvider.java index 5678ea8c..96dbfd9c 100644 --- a/src/main/java/com/redhat/exhort/providers/JavaScriptNpmProvider.java +++ b/src/main/java/com/redhat/exhort/providers/JavaScriptNpmProvider.java @@ -39,25 +39,11 @@ protected String lockFileName() { @Override protected String[] updateLockFileCmd(Path manifestDir) { - return new String[] { - packageManager(), "i", "--package-lock-only", "--prefix", manifestDir.toString() - }; + return new String[] {packageManager(), "i", "--package-lock-only"}; } @Override protected String[] listDepsCmd(boolean includeTransitive, Path manifestDir) { - if (manifestDir != null) { - return new String[] { - packageManager(), - "ls", - includeTransitive ? "--all" : "--depth=0", - "--omit=dev", - "--package-lock-only", - "--json", - "--prefix", - manifestDir.toString() - }; - } return new String[] { packageManager(), "ls", diff --git a/src/main/java/com/redhat/exhort/providers/JavaScriptProvider.java b/src/main/java/com/redhat/exhort/providers/JavaScriptProvider.java index beb43a65..7671457d 100644 --- a/src/main/java/com/redhat/exhort/providers/JavaScriptProvider.java +++ b/src/main/java/com/redhat/exhort/providers/JavaScriptProvider.java @@ -222,17 +222,10 @@ protected JsonNode buildDependencyTree(boolean includeTransitive) throws JsonPro } var createPackageLock = updateLockFileCmd(manifestDir); // execute the clean command - Operations.runProcess(createPackageLock, getExecEnv()); - String[] allDeps; - Path workDir = null; - if (!manifest.path.getParent().toString().trim().contains(" ")) { - allDeps = listDepsCmd(includeTransitive, manifestDir); - } else { - allDeps = listDepsCmd(includeTransitive, null); - workDir = manifest.path.getParent(); - } + Operations.runProcess(manifestDir, createPackageLock, getExecEnv()); + String[] allDeps = listDepsCmd(includeTransitive, manifestDir); // execute the clean command - String output = Operations.runProcessGetOutput(workDir, allDeps, getExecEnvAsArgs()); + String output = Operations.runProcessGetOutput(manifestDir, allDeps, getExecEnvAsArgs()); if (debugLoggingIsNeeded()) { log.info( String.format("Listed Install Packages in Json : %s %s", System.lineSeparator(), output));