[8012] don't use sh -c for subshell

[gavinsmith0123]

Revision: 8012
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=8012
Author:   gavin
Date:     2018-08-07 09:46:25 -0400 (Tue, 07 Aug 2018)
Log Message:
-----------
don't use sh -c for subshell

Modified Paths:
--------------
    trunk/info/t/Init-inter.inc
    trunk/info/t/c-u-m-x-scroll-forward.sh
    trunk/info/t/inc-sea-insensitive.sh
    trunk/info/t/search-split-after-index.sh
    trunk/info/t/split-footnotes.sh
    trunk/info/t/star-note-non-whitespace.sh
    trunk/info/t/tab-argument.sh
    trunk/info/t/xref-across-lines-2.sh
    trunk/info/t/xref-across-lines.sh

Modified: trunk/info/t/Init-inter.inc
===================================================================
--- trunk/info/t/Init-inter.inc 2018-08-07 11:19:23 UTC (rev 8011)
+++ trunk/info/t/Init-inter.inc 2018-08-07 13:46:25 UTC (rev 8012)
@@ -1,4 +1,4 @@
-# Copyright (C) 2014, 2015, 2016 Free Software Foundation, Inc.
+# Copyright (C) 2014, 2015, 2016, 2017, 2018 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -92,11 +92,11 @@
 
 run_ginfo ()
 {
-  sh -c "
+  (
     exec 7>&- ; # Close fd from parent shell
 
-    (sleep 3 ; kill \$\$) &
-    exec $GINFO $GINFO_OPTIONS $* 0<>$PTS_DEVICE 1<&0 ;" &
+    exec $GINFO $GINFO_OPTIONS "$@" 0<>$PTS_DEVICE 1<&0 ; ) &
 
   GINFO_PID=$!
+  (sleep 3 ; kill $GINFO_PID) &
 }

Modified: trunk/info/t/c-u-m-x-scroll-forward.sh
===================================================================
--- trunk/info/t/c-u-m-x-scroll-forward.sh      2018-08-07 11:19:23 UTC (rev 
8011)
+++ trunk/info/t/c-u-m-x-scroll-forward.sh      2018-08-07 13:46:25 UTC (rev 
8012)
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (C) 2014, 2015, 2016, 2017 Free Software Foundation, Inc.
+# Copyright (C) 2014, 2015, 2016, 2017, 2018 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -28,7 +28,7 @@
 LINES=7; export LINES
 COLUMNS=80; export COLUMNS
 
-run_ginfo "-f intera -n 'Scroll four lines'"
+run_ginfo -f intera -n 'Scroll four lines'
 
 # C-u M-x scroll-forward should scroll four lines, not four screens
 printf '\025\033xscroll-forward\r' >$PTY_TYPE

Modified: trunk/info/t/inc-sea-insensitive.sh
===================================================================
--- trunk/info/t/inc-sea-insensitive.sh 2018-08-07 11:19:23 UTC (rev 8011)
+++ trunk/info/t/inc-sea-insensitive.sh 2018-08-07 13:46:25 UTC (rev 8012)
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (C) 2014, 2015, 2016, 2017 Free Software Foundation, Inc.
+# Copyright (C) 2014, 2015, 2016, 2017, 2018 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
 . $srcdir/t/Init-test.inc
 . $t/Init-inter.inc
 
-run_ginfo "-f intera -n 'Incremental search case-insensitive'"
+run_ginfo -f intera -n 'Incremental search case-insensitive'
 
 # Search for "match" with incremental search, adding an upper-case character
 # to make the search case-sensitive.  Delete it and check the search goes back

Modified: trunk/info/t/search-split-after-index.sh
===================================================================
--- trunk/info/t/search-split-after-index.sh    2018-08-07 11:19:23 UTC (rev 
8011)
+++ trunk/info/t/search-split-after-index.sh    2018-08-07 13:46:25 UTC (rev 
8012)
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (C) 2016, 2017 Free Software Foundation, Inc.
+# Copyright (C) 2016, 2017, 2018 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
 
 # Search for text in a split file after loading an index entry from the
 # command-line.
-run_ginfo "-f split 'Link to node'"
+run_ginfo -f split 'Link to node'
 printf '/node\r}}}}}q' >$PTY_TYPE
 
 timeout_test

Modified: trunk/info/t/split-footnotes.sh
===================================================================
--- trunk/info/t/split-footnotes.sh     2018-08-07 11:19:23 UTC (rev 8011)
+++ trunk/info/t/split-footnotes.sh     2018-08-07 13:46:25 UTC (rev 8012)
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (C) 2014, 2015, 2017 Free Software Foundation, Inc.
+# Copyright (C) 2014, 2015, 2017, 2018 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
 . $srcdir/t/Init-test.inc
 . $t/Init-inter.inc
 
-run_ginfo "-f intera -n 'Node with footnotes' -v automatic-footnotes=On"
+run_ginfo -f intera -n 'Node with footnotes' -v automatic-footnotes=On
 # Move to automatic footnotes window and split it.  Check we don't crash.
 printf '\030o\0302qqqq' >$PTY_TYPE
 timeout_test

Modified: trunk/info/t/star-note-non-whitespace.sh
===================================================================
--- trunk/info/t/star-note-non-whitespace.sh    2018-08-07 11:19:23 UTC (rev 
8011)
+++ trunk/info/t/star-note-non-whitespace.sh    2018-08-07 13:46:25 UTC (rev 
8012)
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (C) 2014, 2017 Free Software Foundation, Inc.
+# Copyright (C) 2014, 2017, 2018 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
 . $srcdir/t/Init-test.inc
 . $t/Init-inter.inc
 
-run_ginfo "-f intera -n 'Star note non-whitespace'"
+run_ginfo -f intera -n 'Star note non-whitespace'
 
 # Check that "*note" is not interpreted as a cross-reference marker if
 # it is followed by a non-whitespace character.

Modified: trunk/info/t/tab-argument.sh
===================================================================
--- trunk/info/t/tab-argument.sh        2018-08-07 11:19:23 UTC (rev 8011)
+++ trunk/info/t/tab-argument.sh        2018-08-07 13:46:25 UTC (rev 8012)
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (C) 2014, 2017 Free Software Foundation, Inc.
+# Copyright (C) 2014, 2017, 2018 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
 . $srcdir/t/Init-test.inc
 . $t/Init-inter.inc
 
-run_ginfo "-f intera -n 'Argument to tab'"
+run_ginfo -f intera -n 'Argument to tab'
 # C-u 2 TAB to go to second link
 printf '\0252\t\rDq' >$PTY_TYPE
 timeout_test

Modified: trunk/info/t/xref-across-lines-2.sh
===================================================================
--- trunk/info/t/xref-across-lines-2.sh 2018-08-07 11:19:23 UTC (rev 8011)
+++ trunk/info/t/xref-across-lines-2.sh 2018-08-07 13:46:25 UTC (rev 8012)
@@ -18,7 +18,7 @@
 . $srcdir/t/Init-test.inc
 . $t/Init-inter.inc
 
-run_ginfo '-f intera -n "Xref target crosses lines 2"'
+run_ginfo -f intera -n "Xref target crosses lines 2"
 printf '\t\rDq' >$PTY_TYPE
 timeout_test
 

Modified: trunk/info/t/xref-across-lines.sh
===================================================================
--- trunk/info/t/xref-across-lines.sh   2018-08-07 11:19:23 UTC (rev 8011)
+++ trunk/info/t/xref-across-lines.sh   2018-08-07 13:46:25 UTC (rev 8012)
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (C) 2015, 2017 Free Software Foundation, Inc.
+# Copyright (C) 2015, 2017, 2018 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
 . $srcdir/t/Init-test.inc
 . $t/Init-inter.inc
 
-run_ginfo "-f intera -n 'Xref target crosses lines'"
+run_ginfo -f intera -n 'Xref target crosses lines'
 printf '\t\rDq' >$PTY_TYPE
 timeout_test