mc: Update from 4.8.15 to 4.8.16

[termux-packages] / packages / mc / lib-shell.c.patch

diff --git a/packages/mc/lib-shell.c.patch b/packages/mc/lib-shell.c.patch
new file mode 100644 (file)
index 0000000..4fa2a4d
--- /dev/null
+++ b/packages/mc/lib-shell.c.patch
@@ -0,0 +1,35 @@
+diff -u -r ../mc-4.8.16/lib/shell.c ./lib/shell.c
+--- ../mc-4.8.16/lib/shell.c   2016-03-12 10:45:47.000000000 -0500
++++ ./lib/shell.c      2016-03-14 20:31:50.981985797 -0400
+@@ -64,18 +64,14 @@
+     mc_shell = g_new0 (mc_shell_t, 1);
+ 
+     /* 3rd choice: look for existing shells supported as MC subshells.  */
+-    if (access ("/bin/bash", X_OK) == 0)
++    if (access ("@TERMUX_PREFIX@/bin/bash", X_OK) == 0)
+         mc_shell->path = g_strdup ("/bin/bash");
+-    else if (access ("/bin/ash", X_OK) == 0)
++    else if (access ("@TERMUX_PREFIX@/bin/applets/ash", X_OK) == 0)
+         mc_shell->path = g_strdup ("/bin/ash");
+-    else if (access ("/bin/dash", X_OK) == 0)
++    else if (access ("@TERMUX_PREFIX@/bin/dash", X_OK) == 0)
+         mc_shell->path = g_strdup ("/bin/dash");
+-    else if (access ("/bin/busybox", X_OK) == 0)
+-        mc_shell->path = g_strdup ("/bin/busybox");
+-    else if (access ("/bin/zsh", X_OK) == 0)
++    else if (access ("@TERMUX_PREFIX/bin/zsh", X_OK) == 0)
+         mc_shell->path = g_strdup ("/bin/zsh");
+-    else if (access ("/bin/tcsh", X_OK) == 0)
+-        mc_shell->path = g_strdup ("/bin/tcsh");
+     /* No fish as fallback because it is so much different from other shells and
+      * in a way exotic (even though user-friendly by name) that we should not
+      * present it as a subshell without the user's explicit intention. We rather
+@@ -85,7 +81,7 @@
+      */
+     else
+         /* Fallback and last resort: system default shell */
+-        mc_shell->path = g_strdup ("/bin/sh");
++        mc_shell->path = g_strdup ("@TERMUX_PREFIX@/bin/sh");
+ 
+     return mc_shell;
+ }