Use $SHELL instead of hardcoding /bin/sh in ratpoison.

Patch by Mark H Weaver <mhw@netris.org>.

--- ratpoison/src/actions.c.orig	2014-09-14 16:46:08.000000000 +0200
+++ ratpoison/src/actions.c	2015-08-06 15:00:54.951575260 +0200
@@ -228,12 +228,12 @@
   add_command ("escape",        cmd_escape,     1, 1, 1,
                "Key: ", arg_KEY);
   add_command ("exec",          cmd_exec,       1, 1, 1,
-               "/bin/sh -c ", arg_SHELLCMD);
+               "$SHELL -c ", arg_SHELLCMD);
   add_command ("execa",		cmd_execa,	1, 1, 1, 
-	       "/bin/sh -c ", arg_SHELLCMD);
+	       "$SHELL -c ", arg_SHELLCMD);
   add_command ("execf",		cmd_execf,	2, 2, 2, 
 	       "frame to execute in:", arg_FRAME,
-	       "/bin/sh -c ", arg_SHELLCMD);
+	       "$SHELL -c ", arg_SHELLCMD);
   add_command ("fdump",         cmd_fdump,      1, 0, 0,
                "", arg_NUMBER);
   add_command ("focus",         cmd_next_frame, 0, 0, 0);
@@ -367,7 +367,7 @@
   add_command ("unsetenv",      cmd_unsetenv,   1, 1, 1,
                "Variable: ", arg_STRING);
   add_command ("verbexec",      cmd_verbexec,   1, 1, 1,
-               "/bin/sh -c ", arg_SHELLCMD);
+               "$SHELL -c ", arg_SHELLCMD);
   add_command ("version",       cmd_version,    0, 0, 0);
   add_command ("vsplit",        cmd_v_split,    1, 0, 0,
                "Split: ", arg_STRING);
@@ -2671,6 +2671,9 @@
   pid = fork();
   if (pid == 0)
     {
+      char *shell_path;
+      char *shell_name;
+
       /* Some process setup to make sure the spawned process runs
          in its own session. */
       putenv(current_screen()->display_string);
@@ -2700,7 +2703,18 @@
       /* raw means don't run it through sh.  */
       if (raw)
         execl (cmd, cmd, (char *)NULL);
-      execl("/bin/sh", "sh", "-c", cmd, (char *)NULL);
+
+      shell_path = getenv ("SHELL");
+      if (shell_path == NULL)
+        shell_path = "/bin/sh";
+
+      shell_name = strrchr (shell_path, '/');
+      if (shell_name == NULL)
+        shell_name = shell_path;
+      else
+        shell_name++;
+
+      execl(shell_path, shell_name, "-c", cmd, (char *)NULL);
       _exit(EXIT_FAILURE);
     }
 
--- ratpoison/src/events.c.orig	2014-09-14 16:46:23.000000000 +0200
+++ ratpoison/src/events.c	2015-08-06 15:02:17.287578780 +0200
@@ -919,7 +919,7 @@
             {
               /* Report any child that didn't return 0. */
               if (cur->status != 0)
-                marked_message_printf (0,0, "/bin/sh -c \"%s\" finished (%d)",
+                marked_message_printf (0,0, "$SHELL -c \"%s\" finished (%d)",
                                        cur->cmd, cur->status);
               list_del  (&cur->node);
               free (cur->cmd);
--- ratpoison/src/messages.h.orig	2014-04-09 01:22:08.000000000 +0200
+++ ratpoison/src/messages.h	2015-08-06 15:04:14.759583801 +0200
@@ -39,7 +39,7 @@
 
 #define MESSAGE_PROMPT_SWITCH_TO_WINDOW "Switch to window: "
 #define MESSAGE_PROMPT_NEW_WINDOW_NAME  "Set window's title to: "
-#define MESSAGE_PROMPT_SHELL_COMMAND    "/bin/sh -c "
+#define MESSAGE_PROMPT_SHELL_COMMAND    "$SHELL -c "
 #define MESSAGE_PROMPT_COMMAND          ":"
 #define MESSAGE_PROMPT_SWITCH_WM        "Switch to wm: "
 #define MESSAGE_PROMPT_XTERM_COMMAND    MESSAGE_PROMPT_SHELL_COMMAND TERM_PROG " -e "
s='commit-info'>
<tr><th>author</th><td>Marius Bakke &lt;mbakke@fastmail.com&gt;</td><td class='right'>2017-07-22 13:26:50 +0200</td></tr>
<tr><th>committer</th><td>Marius Bakke &lt;mbakke@fastmail.com&gt;</td><td class='right'>2017-07-22 14:31:27 +0200</td></tr>
<tr><th>commit</th><td colspan='2' class='oid'><a href='/guix/commit/?id=eb2b5f9d03caefe9052e20a18dd740d1be37c927'>eb2b5f9d03caefe9052e20a18dd740d1be37c927</a> (<a href='/guix/patch/?id=eb2b5f9d03caefe9052e20a18dd740d1be37c927'>patch</a>)</td></tr>
<tr><th>tree</th><td colspan='2' class='oid'><a href='/guix/tree/?id=eb2b5f9d03caefe9052e20a18dd740d1be37c927'>c45c844d0815235184f10b5ac340f7c34029061d</a></td></tr>
<tr><th>parent</th><td colspan='2' class='oid'><a href='/guix/commit/?id=0cd95cefe0b09626833a67e5ab4072148f3bffdf'>0cd95cefe0b09626833a67e5ab4072148f3bffdf</a> (<a href='/guix/diff/?id=eb2b5f9d03caefe9052e20a18dd740d1be37c927&amp;id2=0cd95cefe0b09626833a67e5ab4072148f3bffdf'>diff</a>)</td></tr><tr><th>download</th><td colspan='2' class='oid'><a href='/guix/snapshot/guix-eb2b5f9d03caefe9052e20a18dd740d1be37c927.tar.gz'>guix-eb2b5f9d03caefe9052e20a18dd740d1be37c927.tar.gz</a><br/><a href='/guix/snapshot/guix-eb2b5f9d03caefe9052e20a18dd740d1be37c927.zip'>guix-eb2b5f9d03caefe9052e20a18dd740d1be37c927.zip</a><br/></td></tr></table>
<div class='commit-subject'>gnu: slop: Update to 6.3.47.</div><div class='commit-msg'>* gnu/packages/xdisorg.scm (slop): Update to 6.3.47.
[inputs]: Add GLEW.
</div><div class='diffstat-header'><a href='/guix/diff/?id=eb2b5f9d03caefe9052e20a18dd740d1be37c927'>Diffstat</a></div><table summary='diffstat' class='diffstat'><tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/guix/diff/gnu/packages/xdisorg.scm?id=eb2b5f9d03caefe9052e20a18dd740d1be37c927'>gnu/packages/xdisorg.scm</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='7%'><tr><td class='add' style='width: 57.1%;'/><td class='rem' style='width: 42.9%;'/><td class='none' style='width: 0.0%;'/></tr></table></td></tr>
</table><div class='diffstat-summary'>1 files changed, 4 insertions, 3 deletions</div><table summary='diff' class='diff'><tr><td><div class='head'>diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm<br/>index 11acf326ef..c8f4f9746f 100644<br/>--- a/<a href='/guix/tree/gnu/packages/xdisorg.scm?id=0cd95cefe0b09626833a67e5ab4072148f3bffdf'>gnu/packages/xdisorg.scm</a><br/>+++ b/<a href='/guix/tree/gnu/packages/xdisorg.scm?id=eb2b5f9d03caefe9052e20a18dd740d1be37c927'>gnu/packages/xdisorg.scm</a></div><div class='hunk'>@@ -452,7 +452,7 @@ of the screen selected by mouse.")</div><div class='ctx'> (define-public slop</div><div class='ctx'>   (package</div><div class='ctx'>     (name "slop")</div><div class='del'>-    (version "6.3.45")</div><div class='add'>+    (version "6.3.47")</div><div class='ctx'>     (source (origin</div><div class='ctx'>               (method url-fetch)</div><div class='ctx'>               (uri (string-append</div><div class='hunk'>@@ -461,12 +461,13 @@ of the screen selected by mouse.")</div><div class='ctx'>               (file-name (string-append name "-" version ".tar.gz"))</div><div class='ctx'>               (sha256</div><div class='ctx'>                (base32</div><div class='del'>-                "0lzyjcg6yff1vzlsda45i57khajp56yrmcjfa5faw3i60fnqqiy7"))))</div><div class='add'>+                "1kjivsq4c7dr7ggp44k09xm97i9chg8czvachqrfnv6fiqvwys0i"))))</div><div class='ctx'>     (build-system cmake-build-system)</div><div class='ctx'>     (arguments</div><div class='ctx'>      '(#:tests? #f)) ; no "check" target</div><div class='ctx'>     (inputs</div><div class='del'>-     `(("glm" ,glm)</div><div class='add'>+     `(("glew" ,glew)</div><div class='add'>+       ("glm" ,glm)</div><div class='ctx'>        ("icu4c" ,icu4c)</div><div class='ctx'>        ("libxext" ,libxext)</div><div class='ctx'>        ("libxrender" ,libxrender)</div></td></tr></table></div> <!-- class=content -->
                         <div class=footer>generated by
                             <a href="https://git.zx2c4.com/cgit/about/">
                                 cgit
                             </a>
                         </div>
                        </div> <!-- id=cgit -->
</body>
</html>