Use bash as login shell by default

[termux-packages] / ndk_patches / pwd.patch

diff --git a/ndk_patches/pwd.patch b/ndk_patches/pwd.patch
index 5ce3323c76ccb8d97e2f8f41403bb037031cf810..2cd2cb8ff48995db4698867d18d25a9ece25491d 100644 (file)
--- a/ndk_patches/pwd.patch
+++ b/ndk_patches/pwd.patch
@@ -11,7 +11,7 @@ diff -u -r /home/fornwall/lib/android-ndk/platforms/android-21/arch-arm/usr/incl
  #define _PATH_PASSWD        "/etc/passwd"
  #define _PATH_MASTERPASSWD  "/etc/master.passwd"
  #define _PATH_MASTERPASSWD_LOCK "/etc/ptmp"
-@@ -119,6 +122,39 @@
+@@ -119,6 +122,41 @@
  int getpwnam_r(const char*, struct passwd*, char*, size_t, struct passwd**);
  int getpwuid_r(uid_t, struct passwd*, char*, size_t, struct passwd**);
  
@@ -24,7 +24,9 @@ diff -u -r /home/fornwall/lib/android-ndk/platforms/android-21/arch-arm/usr/incl
 +       static char realpath_buffer[4096/*PATH_MAX*/];
 +       char* result = realpath("@TERMUX_HOME@/.termux/shell", realpath_buffer);
 +       if (result == NULL || access(realpath_buffer, X_OK) == -1) {
-+               pw->pw_shell = "@TERMUX_PREFIX@/bin/ash";
++              char const* bash_path = "@TERMUX_PREFIX@/bin/bash";
++              if (access(bash_path, X_OK) != -1) pw->pw_shell = bash_path;
++              else pw->pw_shell = "@TERMUX_PREFIX@/bin/ash";
 +       } else {
 +               pw->pw_shell = realpath_buffer;
 +       }