components/shell/bash/patches/solaris-012.inputrc.location.patch

   1 Solaris-specific system paths. Our bash configuration lives in /etc/bash/inputrc.
   2
   3 --- doc/bash.info.orig  2020-11-18 21:13:06.000000000 +0000
   4 +++ doc/bash.info       2020-12-08 12:17:05.628090856 +0000
   5 @@ -7586,7 +7586,7 @@
   6  directory.  The name of this file is taken from the value of the shell
   7  variable 'INPUTRC'.  If that variable is unset, the default is
   8  '~/.inputrc'.  If that file does not exist or cannot be read, the
   9 -ultimate default is '/etc/inputrc'.  The 'bind' builtin command can also
  10 +ultimate default is '/etc/bash/inputrc'.  The 'bind' builtin command can also
  11  be used to set Readline keybindings and variables.  *Note Bash
  12  Builtins::.
  13
  14 @@ -8135,8 +8135,8 @@
  15  '$include'
  16       This directive takes a single filename as an argument and reads
  17       commands and bindings from that file.  For example, the following
  18 -     directive reads from '/etc/inputrc':
  19 -          $include /etc/inputrc
  20 +     directive reads from '/etc/bash/inputrc':
  21 +          $include /etc/bash/inputrc
  22
  23  \x1f
  24  File: bash.info,  Node: Sample Init File,  Prev: Conditional Init Constructs,  Up: Readline Init File
  25 @@ -8155,8 +8155,8 @@
  26       # Lines beginning with '#' are comments.
  27       #
  28       # First, include any system-wide bindings and variable
  29 -     # assignments from /etc/Inputrc
  30 -     $include /etc/Inputrc
  31 +     # assignments from /etc/bash/Inputrc
  32 +     $include /etc/bash/Inputrc
  33
  34       #
  35       # Set various bindings for emacs mode.
  36 --- doc/bashref.info.orig       2020-11-18 21:12:25.000000000 +0000
  37 +++ doc/bashref.info    2020-12-08 12:16:14.823974296 +0000
  38 @@ -7586,7 +7586,7 @@
  39  directory.  The name of this file is taken from the value of the shell
  40  variable 'INPUTRC'.  If that variable is unset, the default is
  41  '~/.inputrc'.  If that file does not exist or cannot be read, the
  42 -ultimate default is '/etc/inputrc'.  The 'bind' builtin command can also
  43 +ultimate default is '/etc/bash/inputrc'.  The 'bind' builtin command can also
  44  be used to set Readline keybindings and variables.  *Note Bash
  45  Builtins::.
  46
  47 @@ -8135,8 +8135,8 @@
  48  '$include'
  49       This directive takes a single filename as an argument and reads
  50       commands and bindings from that file.  For example, the following
  51 -     directive reads from '/etc/inputrc':
  52 -          $include /etc/inputrc
  53 +     directive reads from '/etc/bash/inputrc':
  54 +          $include /etc/bash/inputrc
  55
  56  \x1f
  57  File: bashref.info,  Node: Sample Init File,  Prev: Conditional Init Constructs,  Up: Readline Init File
  58 @@ -8155,8 +8155,8 @@
  59       # Lines beginning with '#' are comments.
  60       #
  61       # First, include any system-wide bindings and variable
  62 -     # assignments from /etc/Inputrc
  63 -     $include /etc/Inputrc
  64 +     # assignments from /etc/bash/Inputrc
  65 +     $include /etc/bash/Inputrc
  66
  67       #
  68       # Set various bindings for emacs mode.
  69 --- doc/bash.1.orig     2020-11-18 21:03:59.000000000 +0000
  70 +++ doc/bash.1  2020-12-08 12:21:43.110560302 +0000
  71 @@ -5508,7 +5508,7 @@
  72  variable.  If that variable is unset, the default is
  73  .IR ~/.inputrc .
  74  If that file  does not exist or cannot be read, the ultimate default is
  75 -.IR /etc/inputrc .
  76 +.IR /etc/bash/inputrc .
  77  When a program which uses the readline library starts up, the
  78  initialization file is read, and the key bindings and variables
  79  are set.
  80 @@ -6114,11 +6114,11 @@
  81  .IP \fB$include\fP
  82  This directive takes a single filename as an argument and reads commands
  83  and bindings from that file.  For example, the following directive
  84 -would read \fI/etc/inputrc\fP:
  85 +would read \fI/etc/bash/inputrc\fP:
  86  .sp 1
  87  .RS
  88  .nf
  89 -\fB$include\fP \^ \fI/etc/inputrc\fP
  90 +\fB$include\fP \^ \fI/etc/bash/inputrc\fP
  91  .fi
  92  .RE
  93  .SS Searching
  94 --- lib/readline/rlconf.h.orig  2017-02-21 16:25:30.000000000 +0000
  95 +++ lib/readline/rlconf.h       2020-12-08 12:19:52.079293614 +0000
  96 @@ -43,7 +43,7 @@
  97  #define DEFAULT_INPUTRC "~/.inputrc"
  98
  99  /* The ultimate last-ditch filename for an init file -- system-wide. */
 100 -#define SYS_INPUTRC "/etc/inputrc"
 101 +#define SYS_INPUTRC "/etc/bash/inputrc"
 102
 103  /* If defined, expand tabs to spaces. */
 104  #define DISPLAY_TABS