From 8f156dc58ffeb1a6397bd7854e30cc07b62868fd Mon Sep 17 00:00:00 2001 From: agnostic-apollo Date: Sat, 29 Mar 2025 09:27:19 +0500 Subject: [PATCH] Fixed: Do not assume failure if `stderr` is set for bootstrap second stage as a `postinst` script could be using `stderr` for logging Exit code `0` should be enough to check for failure. --- app/src/main/java/com/termux/app/TermuxInstaller.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/src/main/java/com/termux/app/TermuxInstaller.java b/app/src/main/java/com/termux/app/TermuxInstaller.java index 80766a24..98157a05 100644 --- a/app/src/main/java/com/termux/app/TermuxInstaller.java +++ b/app/src/main/java/com/termux/app/TermuxInstaller.java @@ -228,8 +228,7 @@ final class TermuxInstaller { executionCommand.commandLabel = "Termux Bootstrap Second Stage Command"; executionCommand.backgroundCustomLogLevel = Logger.LOG_LEVEL_NORMAL; TermuxTask termuxTask = TermuxTask.execute(activity, executionCommand, null, new TermuxShellEnvironmentClient(), true); - boolean stderrSet = !executionCommand.resultData.stderr.toString().isEmpty(); - if (termuxTask == null || !executionCommand.isSuccessful() || executionCommand.resultData.exitCode != 0 || stderrSet) { + if (termuxTask == null || !executionCommand.isSuccessful() || executionCommand.resultData.exitCode != 0) { // Generate debug report before deleting broken prefix directory to get `stat` info at time of failure. showBootstrapErrorDialog(activity, whenDone, MarkdownUtils.getMarkdownCodeForString(executionCommand.toString(), true));