|
Lines 42-53
java-vm-2_pkg_postinst() {
Link Here
|
| 42 |
# Note that we cannot rely on java-config here, as it will silently recognize |
42 |
# Note that we cannot rely on java-config here, as it will silently recognize |
| 43 |
# e.g. icedtea6-bin as valid system VM if icedtea6 is set but invalid (e.g. due |
43 |
# e.g. icedtea6-bin as valid system VM if icedtea6 is set but invalid (e.g. due |
| 44 |
# to the migration to icedtea-6) |
44 |
# to the migration to icedtea-6) |
| 45 |
if [[ ! -L "${JAVA_VM_SYSTEM}" ]]; then |
45 |
if [[ ! -L "${ROOT}${JAVA_VM_SYSTEM}" ]]; then |
| 46 |
java_set_default_vm_ |
46 |
java_set_default_vm_ |
| 47 |
else |
47 |
else |
| 48 |
local current_vm_path="$(readlink "${JAVA_VM_SYSTEM}")" |
48 |
local current_vm_path=$(readlink "${ROOT}${JAVA_VM_SYSTEM}") |
| 49 |
local current_vm="$(basename "${current_vm_path}")" |
49 |
local current_vm=$(basename "${ROOT}${current_vm_path}") |
| 50 |
if [[ ! -L "${JAVA_VM_DIR}/${current_vm}" ]]; then |
50 |
if [[ ! -L "${ROOT}${JAVA_VM_DIR}/${current_vm}" ]]; then |
| 51 |
java_set_default_vm_ |
51 |
java_set_default_vm_ |
| 52 |
fi |
52 |
fi |
| 53 |
fi |
53 |
fi |
|
Lines 69-75
java-vm_check-nsplugin() {
Link Here
|
| 69 |
|
69 |
|
| 70 |
# Install a default nsplugin if we don't already have one |
70 |
# Install a default nsplugin if we don't already have one |
| 71 |
if in_iuse nsplugin && use nsplugin; then |
71 |
if in_iuse nsplugin && use nsplugin; then |
| 72 |
if [[ ! -f "${EPREFIX}"/usr/${libdir}/nsbrowser/plugins/javaplugin.so ]]; then |
72 |
if [[ ! -f "${ROOT}${EPREFIX}"/usr/${libdir}/nsbrowser/plugins/javaplugin.so ]]; then |
| 73 |
einfo "No system nsplugin currently set." |
73 |
einfo "No system nsplugin currently set." |
| 74 |
java-vm_set-nsplugin |
74 |
java-vm_set-nsplugin |
| 75 |
else |
75 |
else |
