gronod/lfs
1
0
Fork 0
mirror of https://git.linuxfromscratch.org/lfs.git synced 2025-06-19 03:39:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove extraneous && in chained commands

Browse Source 
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@8235 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
This commit is contained in:
Dan Nichilson 2007-07-24 14:48:14 +00:00
parent 0102f53592
commit ad83f72ad8
12 changed files with 37 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
chapter01/changelog.xml
View File

@ -36,6 +36,16 @@
</listitem> </listitem>
--> -->
<listitem>
<para>2007-07-24</para>
<itemizedlist>
<listitem>
<para>[dnicholson] - Remove inconsistent uses of &amp;&amp; from
the book.</para>
</listitem>
</itemizedlist>
</listitem>
<listitem> <listitem>
<para>2007-07-23</para> <para>2007-07-23</para>
<itemizedlist> <itemizedlist>

6
chapter05/adjusting.xml
View File

@ -66,9 +66,9 @@ ln -sv /tools/bin/ld /tools/$(gcc -dumpmachine)/bin/ld</userinput></screen>
their length):</para> their length):</para>
<!-- && used to ease copy and pasting --> <!-- && used to ease copy and pasting -->
<screen><userinput>GCC_INCLUDEDIR=`dirname $(gcc -print-libgcc-file-name)`/include &amp;&amp; <screen><userinput>GCC_INCLUDEDIR=`dirname $(gcc -print-libgcc-file-name)`/include
find ${GCC_INCLUDEDIR}/* -maxdepth 0 -xtype d -exec rm -rvf '{}' \; &amp;&amp; find ${GCC_INCLUDEDIR}/* -maxdepth 0 -xtype d -exec rm -rvf '{}' \;
rm -vf `grep -l "DO NOT EDIT THIS FILE" ${GCC_INCLUDEDIR}/*` &amp;&amp; rm -vf `grep -l "DO NOT EDIT THIS FILE" ${GCC_INCLUDEDIR}/*`
unset GCC_INCLUDEDIR</userinput></screen> unset GCC_INCLUDEDIR</userinput></screen>
<caution> <caution>

4
chapter05/gcc-pass2.xml
View File

@ -71,7 +71,7 @@ Ask your system administrator to create more.</computeroutput></screen>
directory. The running of the <command>fixincludes</command> script can directory. The running of the <command>fixincludes</command> script can
be suppressed by issuing the following commands:</para> be suppressed by issuing the following commands:</para>
<screen><userinput>cp -v gcc/Makefile.in{,.orig} &amp;&amp; <screen><userinput>cp -v gcc/Makefile.in{,.orig}
sed 's@\./fixinc\.sh@-c true@' gcc/Makefile.in.orig &gt; gcc/Makefile.in</userinput></screen> sed 's@\./fixinc\.sh@-c true@' gcc/Makefile.in.orig &gt; gcc/Makefile.in</userinput></screen>
<para>The bootstrap build performed in <xref linkend="ch-tools-gcc-pass1"/> <para>The bootstrap build performed in <xref linkend="ch-tools-gcc-pass1"/>
@ -80,7 +80,7 @@ sed 's@\./fixinc\.sh@-c true@' gcc/Makefile.in.orig &gt; gcc/Makefile.in</userin
<command>sed</command> to use it in order to ensure consistent compiler <command>sed</command> to use it in order to ensure consistent compiler
builds:</para> builds:</para>
<screen><userinput>cp -v gcc/Makefile.in{,.tmp} &amp;&amp; <screen><userinput>cp -v gcc/Makefile.in{,.tmp}
sed 's/^XCFLAGS =$/&amp; -fomit-frame-pointer/' gcc/Makefile.in.tmp \ sed 's/^XCFLAGS =$/&amp; -fomit-frame-pointer/' gcc/Makefile.in.tmp \
&gt; gcc/Makefile.in</userinput></screen> &gt; gcc/Makefile.in</userinput></screen>

2
chapter06/bash.xml
View File

@ -37,7 +37,7 @@
<para>If you downloaded the Bash documentation tarball and wish to install <para>If you downloaded the Bash documentation tarball and wish to install
HTML documentation, issue the following commands:</para> HTML documentation, issue the following commands:</para>
<screen><userinput>tar -xvf ../bash-doc-&bash-doc-version;.tar.gz &amp;&amp; <screen><userinput>tar -xvf ../bash-doc-&bash-doc-version;.tar.gz
sed -i "s|htmldir = @htmldir@|htmldir = /usr/share/doc/bash-&bash-version;|" \ sed -i "s|htmldir = @htmldir@|htmldir = /usr/share/doc/bash-&bash-version;|" \
Makefile.in</userinput></screen> Makefile.in</userinput></screen>

2
chapter06/db.xml
View File

@ -62,7 +62,7 @@
<para>Prepare Berkeley DB for compilation:</para> <para>Prepare Berkeley DB for compilation:</para>
<screen><userinput>cd build_unix &amp;&amp; <screen><userinput>cd build_unix
../dist/configure --prefix=/usr --enable-compat185 --enable-cxx</userinput></screen> ../dist/configure --prefix=/usr --enable-compat185 --enable-cxx</userinput></screen>
<variablelist> <variablelist>

10
chapter06/man-db.xml
View File

@ -41,10 +41,10 @@
with Man-DB, in order for them to be accessible in both traditional and with Man-DB, in order for them to be accessible in both traditional and
UTF-8 locales:</para> UTF-8 locales:</para>
<screen><userinput>mv man/de{_DE.88591,} &amp;&amp; <screen><userinput>mv man/de{_DE.88591,}
mv man/es{_ES.88591,} &amp;&amp; mv man/es{_ES.88591,}
mv man/it{_IT.88591,} &amp;&amp; mv man/it{_IT.88591,}
mv man/ja{_JP.eucJP,} &amp;&amp; mv man/ja{_JP.eucJP,}
sed -i 's,\*_\*,??,' man/Makefile.in</userinput></screen> sed -i 's,\*_\*,??,' man/Makefile.in</userinput></screen>
<para>The second change is a <command>sed</command> substitution to delete <para>The second change is a <command>sed</command> substitution to delete
@ -298,7 +298,7 @@ install -m755 convert-mans /usr/bin</userinput></screen>
(<ulink url="http://ccb.club.fr/man/man-fr-1.58.0.tar.bz2"/>) can be (<ulink url="http://ccb.club.fr/man/man-fr-1.58.0.tar.bz2"/>) can be
installed with the following command:</para> installed with the following command:</para>
<screen role="nodump"><userinput>mkdir -p /usr/share/man/fr &amp;&amp; <screen role="nodump"><userinput>mkdir -p /usr/share/man/fr
cp -rv man? /usr/share/man/fr</userinput></screen> cp -rv man? /usr/share/man/fr</userinput></screen>
<para>If upstream distributes manual pages in UTF-8 (i.e., <quote>for <para>If upstream distributes manual pages in UTF-8 (i.e., <quote>for

4
chapter06/module-init-tools.xml
View File

@ -44,8 +44,8 @@
<command>make distclean</command> command is required to clean up the source <command>make distclean</command> command is required to clean up the source
tree, as the source gets recompiled as part of the testing process):</para> tree, as the source gets recompiled as part of the testing process):</para>
<screen><userinput>./configure &amp;&amp; <screen><userinput>./configure
make check &amp;&amp; make check
make distclean</userinput></screen> make distclean</userinput></screen>
<para>Prepare Module-Init-Tools for compilation:</para> <para>Prepare Module-Init-Tools for compilation:</para>

14
chapter06/ncurses.xml
View File

@ -121,16 +121,16 @@
rm -vf /usr/lib/lib${lib}.so ; \ rm -vf /usr/lib/lib${lib}.so ; \
echo "INPUT(-l${lib}w)" &gt;/usr/lib/lib${lib}.so ; \ echo "INPUT(-l${lib}w)" &gt;/usr/lib/lib${lib}.so ; \
ln -sfv lib${lib}w.a /usr/lib/lib${lib}.a ; \ ln -sfv lib${lib}w.a /usr/lib/lib${lib}.a ; \
done &amp;&amp; done
ln -sfv libncurses++w.a /usr/lib/libncurses++.a</userinput></screen> ln -sfv libncurses++w.a /usr/lib/libncurses++.a</userinput></screen>
<para>Finally, make sure that old applications that look for <para>Finally, make sure that old applications that look for
<filename class="libraryfile">-lcurses</filename> at build time are still <filename class="libraryfile">-lcurses</filename> at build time are still
buildable:</para> buildable:</para>
<screen><userinput>echo "INPUT(-lncursesw)" &gt;/usr/lib/libcursesw.so &amp;&amp; <screen><userinput>echo "INPUT(-lncursesw)" &gt;/usr/lib/libcursesw.so
ln -sfv libncurses.so /usr/lib/libcurses.so &amp;&amp; ln -sfv libncurses.so /usr/lib/libcurses.so
ln -sfv libncursesw.a /usr/lib/libcursesw.a &amp;&amp; ln -sfv libncursesw.a /usr/lib/libcursesw.a
ln -sfv libncurses.a /usr/lib/libcurses.a</userinput></screen> ln -sfv libncurses.a /usr/lib/libcurses.a</userinput></screen>
<note> <note>
@ -140,10 +140,10 @@ ln -sfv libncurses.a /usr/lib/libcurses.a</userinput></screen>
of some binary-only application, build them with the following of some binary-only application, build them with the following
commands:</para> commands:</para>
<screen role="nodump"><userinput>make distclean &amp;&amp; <screen role="nodump"><userinput>make distclean
./configure --prefix=/usr --with-shared --without-normal \ ./configure --prefix=/usr --with-shared --without-normal \
--without-debug --without-cxx-binding &amp;&amp; --without-debug --without-cxx-binding
make sources libs &amp;&amp; make sources libs
cp -av lib/lib*.so.5* /usr/lib</userinput></screen> cp -av lib/lib*.so.5* /usr/lib</userinput></screen>
</note> </note>

4
chapter07/network.xml
View File

@ -109,8 +109,8 @@
<para>The following command creates a sample <filename>ipv4</filename> <para>The following command creates a sample <filename>ipv4</filename>
file for the <emphasis>eth0</emphasis> device:</para> file for the <emphasis>eth0</emphasis> device:</para>
<screen><userinput>cd /etc/sysconfig/network-devices &amp;&amp; <screen><userinput>cd /etc/sysconfig/network-devices
mkdir -v ifconfig.eth0 &amp;&amp; mkdir -v ifconfig.eth0
cat &gt; ifconfig.eth0/ipv4 &lt;&lt; "EOF" cat &gt; ifconfig.eth0/ipv4 &lt;&lt; "EOF"
<literal>ONBOOT=yes <literal>ONBOOT=yes
SERVICE=ipv4-static SERVICE=ipv4-static

2
chapter08/grub.xml
View File

@ -134,7 +134,7 @@ EOF</userinput></screen>
be symlinked to <filename class="symlink">/etc/grub/menu.lst</filename>. To be symlinked to <filename class="symlink">/etc/grub/menu.lst</filename>. To
satisfy this requirement, issue the following command:</para> satisfy this requirement, issue the following command:</para>
<screen><userinput>mkdir -v /etc/grub &amp;&amp; <screen><userinput>mkdir -v /etc/grub
ln -sv /boot/grub/menu.lst /etc/grub</userinput></screen> ln -sv /boot/grub/menu.lst /etc/grub</userinput></screen>
</sect1> </sect1>

2
chapter08/kernel.xml
View File

@ -129,7 +129,7 @@
<para>Install the documentation for the Linux kernel:</para> <para>Install the documentation for the Linux kernel:</para>
<screen><userinput>install -d /usr/share/doc/linux-&linux-version; &amp;&amp; <screen><userinput>install -d /usr/share/doc/linux-&linux-version;
cp -r Documentation/* /usr/share/doc/linux-&linux-version;</userinput></screen> cp -r Documentation/* /usr/share/doc/linux-&linux-version;</userinput></screen>
<para>It is important to note that the files in the kernel source <para>It is important to note that the files in the kernel source

4
general.ent
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?> <?xml version="1.0" encoding="ISO-8859-1"?>
<!ENTITY version "SVN-20070723"> <!ENTITY version "SVN-20070724">
<!ENTITY releasedate "July 23, 2007"> <!ENTITY releasedate "July 24, 2007">
<!ENTITY milestone "6.3"> <!ENTITY milestone "6.3">
<!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" --> <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->