Changeset 22610fa for BOOK

Timestamp:

Sep 5, 2014, 7:31:52 AM (10 years ago)

Author:

Chris Staub <chris@…>

Branches:

clfs-3.0.0-sysvinit, sysvinit

Children:

95835e7

Parents:

819ba78

Message:

Update text on bash startup files/locales

Location:

BOOK/system-config/common

Files:

• locale.xml (modified) (3 diffs)
• profile.xml (modified) (1 diff)

BOOK/system-config/common/locale.xml

@@ -14 +14 @@
   </indexterm>
 
-  <para>The base <filename>/etc/profile</filename> below sets some
-  environment variables necessary for native language support. Setting
-  them properly results in:</para>
+  <para>The instructions below explain how to add some environment variables
+  necessary for native language support to the base
+  <filename>/etc/profile</filename> created in the previous section. Setting
+  these variables properly results in:</para>
 
   <itemizedlist>
@@ -38 +39 @@
     </listitem>
   </itemizedlist>
-
-  <para>This script also sets the <envar>INPUTRC</envar> environment variable
-  that makes Bash and Readline use the <filename>/etc/inputrc</filename> file
-  created earlier.</para>
 
   <para>Replace <replaceable>[ll]</replaceable> below with the
@@ -112 +109 @@
   might provide some useful information.</para>
 
-  <para>Once the proper locale settings have been determined, create the
+  <para>Once the proper locale settings have been determined, add them to the
   <filename>/etc/profile</filename> file:</para>
 
-<screen><userinput>cat &gt; /etc/profile &lt;&lt; "EOF"
-<literal># Begin /etc/profile
+<screen><userinput>cat &gt;&gt; /etc/profile &lt;&lt; "EOF"
 
-export LANG=<replaceable>[ll]</replaceable>_<replaceable>[CC]</replaceable>.<replaceable>[charmap]</replaceable>
-export INPUTRC=/etc/inputrc
+<literal>export LANG=<replaceable>[ll]</replaceable>_<replaceable>[CC]</replaceable>.<replaceable>[charmap]</replaceable>
 
 # End /etc/profile</literal>

BOOK/system-config/common/profile.xml

@@ -38 +38 @@
   <para>The files <filename>/etc/profile</filename> and
   <filename>~/.bash_profile</filename> are read when the shell is
-  invoked as an interactive login shell. In the next section, a base
-  <filename>/etc/profile</filename> will be created to set up locale
-  information.</para>
+  invoked as an interactive login shell. Create a base
+  <filename>/etc/profile</filename> that will load any Bash auto completion
+  files that may be on the system, and set the <envar>INPUTRC</envar>
+  environment variable that makes Bash and Readline use
+  <filename>/etc/inputrc</filename>:</para>
+
+<screen><userinput>cat &gt; /etc/profile &lt;&lt; "EOF"
+<literal># Begin /etc/profile
+
+for f in /etc/bash_completion.d/*
+do
+  if [ -e ${f} ]; then source ${f}; fi
+done
+unset f
+
+export INPUTRC=/etc/inputrc</literal>
+EOF</userinput></screen>
 
 </sect1>