[Fedora-directory-commits] adminserver/admserv/cfgstuff console-ld-libpath.patch, 1.2, 1.3

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

Update of /cvs/dirsec/adminserver/admserv/cfgstuff
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32216

Modified Files:
	console-ld-libpath.patch 
Log Message:
Still need the console ld lib path patch for startconsole


console-ld-libpath.patch:

Index: console-ld-libpath.patch
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cfgstuff/console-ld-libpath.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- console-ld-libpath.patch	8 Dec 2005 02:37:52 -0000	1.2
+++ console-ld-libpath.patch	23 Feb 2006 04:04:14 -0000	1.3
@@ -1,41 +1,22 @@
---- startconsole	26 Oct 2005 23:16:14 -0000	1.4
-+++ startconsole	7 Dec 2005 23:50:54 -0000
-@@ -26,17 +26,17 @@
- then
-   echo "$0: Your JAVA_HOME environment variable is not set.  Please set it appropriately."
-   exit 1
- fi
+--- startconsole.orig	2006-02-22 20:45:12.000000000 -0700
++++ startconsole	2006-02-22 20:46:03.000000000 -0700
+@@ -21,12 +21,19 @@
  
- #
- # Make sure java exists and is executable
- #
--if [ ! -f java -a ! -x java ]
-+if [ ! -f $JAVA_HOME/bin/java -a ! -x $JAVA_HOME/bin/java ]
+ JAVA=`which java`
+ if [ -z "$JAVA" -o ! -x "$JAVA" ]
  then
-   echo "$0: The java program is not in your path, or is not executable."
+   echo "$0: The java program is not in your path, or is not executable.";
    exit 1
  fi
  
- #
- # See if libjava and libjvm exist, and set the lib path.  These are linked to by JSS.
- #
-@@ -53,16 +53,19 @@
-     LD_LIBRARY_PATH="$LIBJAVA_DIR"
-     SHLIB_PATH="$LIBJAVA_DIR"
-     DYLD_PATH="$LIBJAVA_DIR"
-   else
-     LD_LIBRARY_PATH="$LIBJAVA_DIR:$LIBJVM_DIR"
-     SHLIB_PATH="$LIBJAVA_DIR:$LIBJVM_DIR"
-     DYLD_PATH="$LIBJAVA_DIR:$LIBJVM_DIR"
-   fi
-+  LD_LIBRARY_PATH=/opt/fedora-ds/shared/lib:${LD_LIBRARY_PATH}
-+  SHLIB_PATH=/opt/fedora-ds/shared/lib:${SHLIB_PATH}
-+  DYLD_PATH=/opt/fedora-ds/shared/lib:${DYLD_PATH}
-   export LD_LIBRARY_PATH
-   export SHLIB_PATH
-   export DYLD_PATH
- fi
- 
++LD_LIBRARY_PATH=/opt/fedora-ds/shared/lib:${LD_LIBRARY_PATH}
++SHLIB_PATH=/opt/fedora-ds/shared/lib:${SHLIB_PATH}
++DYLD_PATH=/opt/fedora-ds/shared/lib:${DYLD_PATH}
++export LD_LIBRARY_PATH
++export SHLIB_PATH
++export DYLD_PATH
++
  #
  # Launch the Console
  #
+ java -ms8m -mx64m -cp ./java/jss3.jar:./java/ldapjdk.jar:./java/fedora-base-1.0.jar:./java/fedora-mcc-1.0.jar:./java/fedora-mcc-1.0_en.jar:./java/fedora-nmclf-1.0.jar:./java/fedora-nmclf-1.0_en.jar -Djava.library.path=./lib -Djava.util.prefs.systemRoot="$HOME/.fedora-console" -Djava.util.prefs.userRoot="$HOME/.fedora-console" com.netscape.management.client.console.Console $*