Author: dj
Date: 2007-01-28 12:39:54 -0700 (Sun, 28 Jan 2007)
New Revision: 6479
Modified:
trunk/BOOK/general/prog/jdk.xml
trunk/BOOK/introduction/welcome/changelog.xml
trunk/BOOK/introduction/welcome/credits.xml
Log:
Updated /etc/profile.d/jdk.sh script.
Modified: trunk/BOOK/general/prog/jdk.xml
===================================================================
--- trunk/BOOK/general/prog/jdk.xml 2007-01-28 19:22:28 UTC (rev 6478)
+++ trunk/BOOK/general/prog/jdk.xml 2007-01-28 19:39:54 UTC (rev 6479)
@@ -373,7 +373,6 @@
# Set JAVA_HOME directory
JAVA_HOME=/opt/jdk/jdk
-export JAVA_HOME
# Adjust PATH
pathappend ${JAVA_HOME}/bin PATH
@@ -381,21 +380,14 @@
# Auto Java CLASSPATH
# 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>
EOF</userinput></screen>
Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml 2007-01-28 19:22:28 UTC
(rev 6478)
+++ trunk/BOOK/introduction/welcome/changelog.xml 2007-01-28 19:39:54 UTC
(rev 6479)
@@ -54,7 +54,8 @@
instructions.</para>
</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>
</listitem>
Modified: trunk/BOOK/introduction/welcome/credits.xml
===================================================================
--- trunk/BOOK/introduction/welcome/credits.xml 2007-01-28 19:22:28 UTC (rev
6478)
+++ trunk/BOOK/introduction/welcome/credits.xml 2007-01-28 19:39:54 UTC (rev
6479)
@@ -254,8 +254,8 @@
<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>
--
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
