From 2522c62173a01e12b70fab3a60af152c79e4d1f5 Mon Sep 17 00:00:00 2001 From: agnostic-apollo Date: Fri, 28 Mar 2025 12:35:27 +0500 Subject: [PATCH] Changed: Log a message if `termux-bootstrap-second-stage.sh` or `bash` is not found to run bootstrap second stage --- .../main/java/com/termux/app/TermuxInstaller.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/termux/app/TermuxInstaller.java b/app/src/main/java/com/termux/app/TermuxInstaller.java index 48c7310c..80766a24 100644 --- a/app/src/main/java/com/termux/app/TermuxInstaller.java +++ b/app/src/main/java/com/termux/app/TermuxInstaller.java @@ -212,10 +212,16 @@ final class TermuxInstaller { throw new RuntimeException("Moving termux prefix staging to prefix directory failed"); } - // Run Termux bootstrap second stage - Logger.logInfo(LOG_TAG, "Running Termux bootstrap second stage."); + // Run Termux bootstrap second stage. String termuxBootstrapSecondStageFile = TERMUX_PREFIX_DIR_PATH + "/etc/termux/bootstrap/termux-bootstrap-second-stage.sh"; - if (FileUtils.fileExists(termuxBootstrapSecondStageFile, false)) { + if (!FileUtils.fileExists(termuxBootstrapSecondStageFile, false)) { + Logger.logInfo(LOG_TAG, "Not running Termux bootstrap second stage since script not found at \"" + termuxBootstrapSecondStageFile + "\" path."); + } else { + if (!FileUtils.fileExists(TermuxConstants.TERMUX_BIN_PREFIX_DIR_PATH + "/bash", true)) { + Logger.logInfo(LOG_TAG, "Not running Termux bootstrap second stage since bash not found."); + } + Logger.logInfo(LOG_TAG, "Running Termux bootstrap second stage."); + ExecutionCommand executionCommand = new ExecutionCommand(-1, termuxBootstrapSecondStageFile, null, null, null, true, false);