fankes/termux-app
2
0
Fork 0
mirror of https://github.com/fankes/termux-app.git synced 2025-09-06 02:35:19 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added: Add UnixShellEnvironment.LOGIN_SHELL_BINARIES variable for common/supported login shell binaries searched and add fish and sh shell as additional backups

Browse Source
This commit is contained in:
agnostic-apollo
2022-06-11 19:29:24 +05:00
parent 29d05cc72c
commit 9749360caa
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
termux-shared/src/main/java/com/termux/shared/shell/command/environment/UnixShellEnvironment.java
View File

@@ -52,6 +52,9 @@ public abstract class UnixShellEnvironment implements IShellEnvironment {
public static final String ENV_TMPDIR = "TMPDIR"; public static final String ENV_TMPDIR = "TMPDIR";
/** Names for common/supported login shell binaries. */
public static final String[] LOGIN_SHELL_BINARIES = new String[]{"login", "bash", "zsh", "fish", "sh"};
@NonNull @NonNull

2
termux-shared/src/main/java/com/termux/shared/termux/shell/command/runner/terminal/TermuxSession.java
View File

@@ -93,7 +93,7 @@ public class TermuxSession {
boolean isLoginShell = false; boolean isLoginShell = false;
if (executionCommand.executable == null) { if (executionCommand.executable == null) {
if (!executionCommand.isFailsafe) { if (!executionCommand.isFailsafe) {
for (String shellBinary : new String[]{"login", "bash", "zsh"}) { for (String shellBinary : UnixShellEnvironment.LOGIN_SHELL_BINARIES) {
File shellFile = new File(defaultBinPath, shellBinary); File shellFile = new File(defaultBinPath, shellBinary);
if (shellFile.canExecute()) { if (shellFile.canExecute()) {
executionCommand.executable = shellFile.getAbsolutePath(); executionCommand.executable = shellFile.getAbsolutePath();