From 97f2537c31bff51bba149a95708708c8f68e5d16 Mon Sep 17 00:00:00 2001 From: agnostic-apollo Date: Sat, 29 Mar 2025 09:27:08 +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 dfbbb812..403ab208 100644 --- a/app/src/main/java/com/termux/app/TermuxInstaller.java +++ b/app/src/main/java/com/termux/app/TermuxInstaller.java @@ -235,8 +235,7 @@ final class TermuxInstaller { executionCommand.commandLabel = "Termux Bootstrap Second Stage Command"; executionCommand.backgroundCustomLogLevel = Logger.LOG_LEVEL_NORMAL; AppShell appShell = AppShell.execute(activity, executionCommand, null, new TermuxShellEnvironment(), null, true); - boolean stderrSet = !executionCommand.resultData.stderr.toString().isEmpty(); - if (appShell == null || !executionCommand.isSuccessful() || executionCommand.resultData.exitCode != 0 || stderrSet) { + if (appShell == 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));