Branch: Tag:

2003-12-16

2003-12-16 21:46:38 by Jonas Wallden <jonasw@roxen.com>

Detect Mac OS X so we get _JAVA_OPTIONS inited correctly.

Rev: server/etc/env.d/java.pike:1.17

30:    dir =    (Process.popen("java -verbose 2>&1 | sed -n -e 's/^[^/]*//' -e "    "'s:/lib/rt\\.jar.*$::' -e p -e q")||"")-"\n"; +  +  // Mac OS X uses a non-standard directory +  if (has_value(dir, "JavaVM.framework")) +  return "/System/Library/Frameworks/JavaVM.framework/Versions/" +  "CurrentJDK/Home/"; +     if(check_jre_dir(dir))    return dir;    foreach(`+(@Array.map(({"/usr/local", "/usr", "/usr/java"}),