Skip to content

Commit b233210

Browse files
committed
devonfw#415: Changed logPackageManagerCommands
Changed logPackageManagerCommands so that it only prints out the output for the single PackageManagerCommand that will be executed
1 parent b80a029 commit b233210

File tree

1 file changed

+7
-12
lines changed

1 file changed

+7
-12
lines changed

cli/src/main/java/com/devonfw/tools/ide/tool/GlobalToolCommandlet.java

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,7 @@ protected boolean runWithPackageManager(boolean silent, String... commandStrings
5454
* @return {@code true} if installation or uninstallation succeeds with any of the package manager commands, {@code false} otherwise.
5555
*/
5656
protected boolean runWithPackageManager(boolean silent, List<PackageManagerCommand> pmCommands) {
57-
58-
logPackageManagerCommands(pmCommands);
59-
57+
6058
for (PackageManagerCommand pmCommand : pmCommands) {
6159
PackageManager packageManager = pmCommand.packageManager();
6260
Path packageManagerPath = this.context.getPath().findBinary(Path.of(packageManager.getBinaryName()));
@@ -72,17 +70,13 @@ protected boolean runWithPackageManager(boolean silent, List<PackageManagerComma
7270
return false; // None of the package manager commands were successful
7371
}
7472

75-
private void logPackageManagerCommands(List<PackageManagerCommand> pmCommands) {
76-
StringBuilder commandLog = new StringBuilder("We need to run the following privileged command(s):\n");
73+
private void logPackageManagerCommands(PackageManagerCommand pmCommand) {
7774

78-
for (PackageManagerCommand pmCommand : pmCommands) {
79-
for (String command : pmCommand.commands()) {
80-
commandLog.append(command).append("\n");
81-
}
75+
this.context.info("We need to run the following privileged command(s):");
76+
for (String command : pmCommand.commands()) {
77+
this.context.info(command);
8278
}
83-
commandLog.append("This will require root permissions!");
84-
85-
this.context.info(commandLog.toString());
79+
this.context.info("This will require root permissions!");
8680
}
8781

8882
/**
@@ -95,6 +89,7 @@ private void logPackageManagerCommands(List<PackageManagerCommand> pmCommands) {
9589
private boolean executePackageManagerCommand(PackageManagerCommand pmCommand, boolean silent) {
9690

9791
String bashPath = this.context.findBashRequired();
92+
logPackageManagerCommands(pmCommand);
9893
for (String command : pmCommand.commands()) {
9994
ProcessContext pc = this.context.newProcess().errorHandling(ProcessErrorHandling.LOG_WARNING).executable(bashPath)
10095
.addArgs("-c", command);

0 commit comments

Comments
 (0)