From 3094b8c742ed234c5a8423f2bcaf0a9d92802c33 Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Tue, 9 Aug 2022 21:44:44 -0500
Subject: Tweak pip3 instructions

---
 chapter08/jinja2.xml     |  2 +-
 chapter08/markupsafe.xml |  2 +-
 chapter08/python.xml     | 10 ++++++++--
 chapter08/wheel.xml      |  7 +++++--
 4 files changed, 15 insertions(+), 6 deletions(-)

(limited to 'chapter08')

diff --git a/chapter08/jinja2.xml b/chapter08/jinja2.xml
index 6548dff8b..8fa12dd25 100644
--- a/chapter08/jinja2.xml
+++ b/chapter08/jinja2.xml
@@ -46,7 +46,7 @@
 
     <para>Install the package:</para>
 
-<screen><userinput remap="install">pip3 install --no-index --find-links dist Jinja2</userinput></screen>
+<screen><userinput remap="install">pip3 install --no-index --no-user --find-links dist Jinja2</userinput></screen>
 
   </sect2>
 
diff --git a/chapter08/markupsafe.xml b/chapter08/markupsafe.xml
index 322ec2730..9481a194a 100644
--- a/chapter08/markupsafe.xml
+++ b/chapter08/markupsafe.xml
@@ -48,7 +48,7 @@
 
     <para>Install the package:</para>
 
-<screen><userinput remap="install">pip3 install --no-index --find-links dist Markupsafe</userinput></screen>
+<screen><userinput remap="install">pip3 install --no-index --no-user --find-links dist Markupsafe</userinput></screen>
 
   </sect2>
 
diff --git a/chapter08/python.xml b/chapter08/python.xml
index bee232704..da1f75cdc 100644
--- a/chapter08/python.xml
+++ b/chapter08/python.xml
@@ -103,12 +103,18 @@
     of this recommendation is for avoiding a conflict with the system
     package manager (<command>dpkg</command> for example), but LFS does not
     have a system-wide package manager so this is not a problem.  If desired,
-    suppress this warning by running the following command:</para>
+    suppress this warning by running the following commands:</para>
 
+ <screen><userinput remap="install">cat &gt; /etc/pip.conf &lt;&lt; EOF
+[global]
+root-user-action = ignore
+EOF
+</userinput></screen>
+<!--
 <screen><userinput remap="install">sed -e '/def warn_if_run_as_root/a\    return' \
     -i /usr/lib/python3.10/site-packages/pip/_internal/cli/req_command.py
 </userinput></screen>
-
+-->
     <important>
       <para>
         In LFS and BLFS we normally build and install Python modules with the
diff --git a/chapter08/wheel.xml b/chapter08/wheel.xml
index 8e8436ffd..0f6ba7cb6 100644
--- a/chapter08/wheel.xml
+++ b/chapter08/wheel.xml
@@ -80,11 +80,14 @@
 
     <segmentedlist>
       <segtitle>Installed program</segtitle>
-      <segtitle>Installed directory</segtitle>
+      <segtitle>Installed directories</segtitle>
 
       <seglistitem>
         <seg>wheel</seg>
-        <seg>/usr/lib/python&python-minor;/site-packages/wheel</seg>
+        <seg>
+           /usr/lib/python&python-minor;/site-packages/wheel and
+           /usr/lib/python&python-minor;/site-packages/wheel-0.37.1-py3.10.egg-info
+        </seg>
       </seglistitem>
     </segmentedlist>
 
-- 
cgit v1.2.3-54-g00ecf