components/bash/patches/solaris-012.inputrc.location.patch
branchs11u3-sru
changeset 7627 4758b76d5ad5
parent 115 c360825c3a3f
equal deleted inserted replaced
7623:d89b1c5817f5 7627:4758b76d5ad5
       
     1 # Solaris-specific system paths.
       
     2 # Our bash configuration lives in /etc/bash/inputrc.
       
     3 # Not for upstream.
       
     4 
       
     5 --- lib/readline/rlconf.h	2009-01-04 11:32:33.000000000 -0800
       
     6 +++ lib/readline/rlconf.h	2010-09-01 10:48:13.018894232 -0700
       
     7 @@ -43,7 +43,7 @@
       
     8  #define DEFAULT_INPUTRC "~/.inputrc"
       
     9  
       
    10  /* The ultimate last-ditch filenname for an init file -- system-wide. */
       
    11 -#define SYS_INPUTRC "/etc/inputrc"
       
    12 +#define SYS_INPUTRC "/etc/bash/inputrc"
       
    13  
       
    14  /* If defined, expand tabs to spaces. */
       
    15  #define DISPLAY_TABS
       
    16 --- doc/bashref.info	2016-11-20 11:39:05.161711301 +0100
       
    17 +++ doc/bashref.info	2016-11-20 11:38:49.065536928 +0100
       
    18 @@ -7124,7 +7124,7 @@ putting commands in an "inputrc" file, c
       
    19  directory.  The name of this file is taken from the value of the shell
       
    20  variable 'INPUTRC'.  If that variable is unset, the default is
       
    21  '~/.inputrc'.  If that file does not exist or cannot be read, the
       
    22 -ultimate default is '/etc/inputrc'.
       
    23 +ultimate default is '/etc/bash/inputrc'.
       
    24  
       
    25     When a program which uses the Readline library starts up, the init
       
    26  file is read, and the key bindings are set.
       
    27 @@ -7636,8 +7636,8 @@ four parser directives used.
       
    28  '$include'
       
    29       This directive takes a single filename as an argument and reads
       
    30       commands and bindings from that file.  For example, the following
       
    31 -     directive reads from '/etc/inputrc':
       
    32 -          $include /etc/inputrc
       
    33 +     directive reads from '/etc/bash/inputrc':
       
    34 +          $include /etc/bash/inputrc
       
    35  
       
    36  
       
    37  File: bashref.info,  Node: Sample Init File,  Prev: Conditional Init Constructs,  Up: Readline Init File
       
    38 @@ -7656,8 +7656,8 @@ variable assignment, and conditional syn
       
    39       # Lines beginning with '#' are comments.
       
    40       #
       
    41       # First, include any system-wide bindings and variable
       
    42 -     # assignments from /etc/Inputrc
       
    43 -     $include /etc/Inputrc
       
    44 +     # assignments from /etc/bash/inputrc
       
    45 +     $include /etc/bash/inputrc
       
    46  
       
    47       #
       
    48       # Set various bindings for emacs mode.
       
    49 # Solaris-specific configuration defaults.
       
    50 # Our bash system configuration files are in /etc/bash.
       
    51 # Not for upstream.
       
    52 --- doc/bash.1	2011-01-16 12:31:39.000000000 -0800
       
    53 +++ doc/bash.1	2011-11-29 09:57:25.406978670 -0800
       
    54 @@ -5810,11 +5810,11 @@
       
    55  .IP \fB$include\fP
       
    56  This directive takes a single filename as an argument and reads commands
       
    57  and bindings from that file.  For example, the following directive
       
    58 -would read \fI/etc/inputrc\fP:
       
    59 +would read \fI/etc/bash/inputrc\fP:
       
    60  .sp 1
       
    61  .RS
       
    62  .nf
       
    63 -\fB$include\fP \^ \fI/etc/inputrc\fP
       
    64 +\fB$include\fP \^ \fI/etc/bash/inputrc\fP
       
    65  .fi
       
    66  .RE
       
    67  .SS Searching
       
    68 --- doc/bash.info	2016-12-02 09:24:09.777589027 +0000
       
    69 +++ doc/bash.info	2016-12-02 09:23:42.588282332 +0000
       
    70 @@ -7124,7 +7124,7 @@ putting commands in an "inputrc" file, c
       
    71  directory.  The name of this file is taken from the value of the shell
       
    72  variable 'INPUTRC'.  If that variable is unset, the default is
       
    73  '~/.inputrc'.  If that file does not exist or cannot be read, the
       
    74 -ultimate default is '/etc/inputrc'.
       
    75 +ultimate default is '/etc/bash/inputrc'.
       
    76  
       
    77     When a program which uses the Readline library starts up, the init
       
    78  file is read, and the key bindings are set.
       
    79 @@ -7636,7 +7636,7 @@ four parser directives used.
       
    80  '$include'
       
    81       This directive takes a single filename as an argument and reads
       
    82       commands and bindings from that file.  For example, the following
       
    83 -     directive reads from '/etc/inputrc':
       
    84 +     directive reads from '/etc/bash/inputrc':
       
    85            $include /etc/inputrc
       
    86  
       
    87