View | Details | Raw Unified | Return to bug 239705
Collapse All | Expand All

(-)files/pkg-install.in (-2 / +5 lines)
Lines 10-25 Link Here
10
fi
10
fi
11
11
12
# Ensure all JDKs and JREs are installed
12
# Ensure all JDKs and JREs are installed
13
_excl_dirs='bootstrap-openjdk'
13
jdirs=$(cd "${LOCALBASE}" && find *jdk* *jre* -depth 0 -type d 2> /dev/null)
14
set -o noglob
15
_excl_dirs='bootstrap-openjdk.*'
14
_find_expr='-depth 2 -regex .*/bin/java'
16
_find_expr='-depth 2 -regex .*/bin/java'
15
for dir in ${_excl_dirs}; do
17
for dir in ${_excl_dirs}; do
16
    _find_expr="${_find_expr} ! -regex ${dir}/bin/java"
18
    _find_expr="${_find_expr} ! -regex ${dir}/bin/java"
17
done
19
done
18
for jvm in `cd "${LOCALBASE}" && find *jdk* *jre* ${_find_expr} 2> /dev/null`; do
20
for jvm in `cd "${LOCALBASE}" && find $jdirs ${_find_expr} 2> /dev/null`; do
19
    if [ -x "${LOCALBASE}/${jvm}" ]; then
21
    if [ -x "${LOCALBASE}/${jvm}" ]; then
20
        "${PKG_PREFIX}"/bin/registervm "${LOCALBASE}/${jvm}" > /dev/null 2>&1
22
        "${PKG_PREFIX}"/bin/registervm "${LOCALBASE}/${jvm}" > /dev/null 2>&1
21
    fi
23
    fi
22
done
24
done
25
set +o noglob
23
26
24
# Ensure all VMs are configured correctly
27
# Ensure all VMs are configured correctly
25
"${PKG_PREFIX}"/bin/checkvms
28
"${PKG_PREFIX}"/bin/checkvms

Return to bug 239705