Changeset 93a1fa3

Timestamp:

01/28/2007 07:39:54 PM (17 years ago)

Author:

DJ Lucas <dj@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 6.2, 6.2.0, 6.2.0-rc1, 6.2.0-rc2, 6.3, 6.3-rc1, 6.3-rc2, 6.3-rc3, 7.10, 7.4, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gnome, kde5-13430, kde5-14269, kde5-14686, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

d91914e

Parents:

fada515

Message:

Updated /etc/profile.d/jdk.sh script.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@6479 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• general/prog/jdk.xml (modified) (2 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)
• introduction/welcome/credits.xml (modified) (1 diff)

general/prog/jdk.xml

@@ -374 +374 @@
 # Set JAVA_HOME directory
 JAVA_HOME=/opt/jdk/jdk
-export JAVA_HOME
 
 # Adjust PATH
@@ -382 +381 @@
 # Copy jar files to, or create symlinks in this directory
 AUTO_CLASSPATH_DIR=/usr/lib/classpath
-# Check for jar files in AUTO_CLASSPATH_DIR (if empty, don't include)
-if [ `ls ${AUTO_CLASSPATH_DIR}/*.jar &> /dev/null` ]; then
-  CLASSPATH=.:${AUTO_CLASSPATH_DIR}
-else
-  # Always have the current directory in the CLASSPATH
-  CLASSPATH=.
-fi
-
-# Add subdirectories
-ls -d ${AUTO_CLASSPATH_DIR}/*/ &> /dev/null &&
-for i in `ls -d ${AUTO_CLASSPATH_DIR}/*/`
-  do CLASSPATH=${CLASSPATH}:"${i}"
+pathprepend . CLASSPATH
+for dir in `find ${AUTO_CLASSPATH_DIR} -type d 2>/dev/null`; do
+    pathappend $dir CLASSPATH
 done
 
-export CLASSPATH
+export JAVA_HOME CLASSPATH
+unset AUTO_CLASSPATH_DIR
+unset dir
 
 # End /etc/profile.d/jdk.sh</literal>

introduction/welcome/changelog.xml

@@ -55 +55 @@
         </listitem>
         <listitem>
-          <para>[dj] - Updated to JDK-1.5.0_10.</para>
+          <para>[dj] - Updated to JDK-1.5.0_10 and modiefied jdk.sh 
+          profile.d script.</para>
         </listitem>
       </itemizedlist>

introduction/welcome/credits.xml

@@ -255 +255 @@
       <listitem>
         <para>Archive::Zip, cracklib, JDK-5, libdrm, libpcap, Mesa, ncpfs,
-        netfs, OpenOffice-2, pppd (update), RP-PPPoE, Samba-3, Subversion
-        and xterm:
+        netfs, OpenOffice-2, pppd (update), RP-PPPoE, Samba-3, Subversion,
+        Xorg-7 and xterm:
         <emphasis>DJ Lucas</emphasis></para>
       </listitem>