From e7122137ee6cb224de1f06b2789bef5c8822942e Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Wed, 8 Jul 2020 16:36:55 +0000
Subject: [PATCH] Minor cleanups

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@23373 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general/genlib/js68.xml | 26 +-------------------------
 xincludes/mozshm.xml    |  3 +--
 2 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/general/genlib/js68.xml b/general/genlib/js68.xml
index 0fb2d0bd7a..9d37cfc72a 100644
--- a/general/genlib/js68.xml
+++ b/general/genlib/js68.xml
@@ -12,7 +12,6 @@
   <!ENTITY js68-time          "2.2 SBU (with parallelism = 4)">
 ]>
 
-<!--<sect1 id="js68" xreflabel="js68-&JS68-version;">-->
 <sect1 id="js68" xreflabel="js68-&JS68-version;">
   <?dbhtml filename="js68.html"?>
 
@@ -69,18 +68,6 @@
       </listitem>
     </itemizedlist>
 
-    <!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/js68-&JS68-version;-python_3-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-    -->
-
     <bridgehead renderas="sect3">JS68 Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
@@ -147,21 +134,11 @@ tar: Exiting with failure status due to previous errors
 
     </note>
 
-    <!--
-    <para>
-      First, apply a patch so we can run the shipped build scripts with
-      Python 3, instead of the EOL'ed Python 2:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../js68-&JS68-version;-python_3-1.patch</userinput></screen>
-    -->
     <para>
       Install <application>JS</application> by running the following
       commands:
     </para>
 
-<!--    &shell-env;-->
-
      <note>
         <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
          href="../../xincludes/mozshm.xml"/>
@@ -277,8 +254,7 @@ rm -v /usr/lib/libjs_static.ajs</userinput></screen>
           js68 and js68-config
         </seg>
         <seg>
-          libmozjs-68.so and libjs_static.ajs <!-- The AJS file doesn't
-          conflict with the one from js52 like originally thought -->
+          libmozjs-68.so and libjs_static.ajs 
         </seg>
         <seg>
           /usr/include/mozjs-68
diff --git a/xincludes/mozshm.xml b/xincludes/mozshm.xml
index f5a577a465..a12717c46f 100644
--- a/xincludes/mozshm.xml
+++ b/xincludes/mozshm.xml
@@ -19,8 +19,7 @@
       <filename>/usr/lib/pythonN.N/multiprocessing/synchronize.py</filename>.
       Run:
 
-<screen role="nodump"><userinput>mountpoint /dev/shm >/dev/null ||
- mount -t tmpfs devshm /dev/shm</userinput></screen>
+<screen role="nodump"><userinput>mountpoint -q /dev/shm || mount -t tmpfs devshm /dev/shm</userinput></screen>
 
     </para>
     <!-- follow with appropriate text about exporting SHELL -->