X-Git-Url: http://git.sven.stormbind.net/?p=sven%2Fjava-package.git;a=blobdiff_plain;f=lib%2Foracle-j2re.sh;h=ad398a0f0da439c3434f2990e87f353a6c0f1dbb;hp=3f837a73ad8b68eea6e7c1c70400d8472cfc92f3;hb=96e84143de30aca040f44983e00cf4011fb794e8;hpb=c1fb4d0a58160b37808c25744cd4e75e2ba5e5ab diff --git a/lib/oracle-j2re.sh b/lib/oracle-j2re.sh index 3f837a7..ad398a0 100644 --- a/lib/oracle-j2re.sh +++ b/lib/oracle-j2re.sh @@ -9,7 +9,7 @@ oracle_j2re_detect() { j2se_arch=${BASH_REMATCH[3]} j2se_version=$j2se_release.$j2se_update j2se_priority=$((310 + $j2se_release - 1)) - j2se_expected_min_size=95 #Mb + j2se_expected_min_size=85 #Mb # check if the architecture matches let compatible=1 @@ -30,33 +30,33 @@ oracle_j2re_detect() { fi - cat << EOF + cat << EOF Detected product: Java(TM) Runtime Environment (JRE) Standard Edition, Version $j2se_release Update $j2se_update Oracle(TM) EOF - if read_yn "Is this correct [Y/n]: "; then - j2se_found=true - j2se_required_space=$(( $j2se_expected_min_size * 2 + 20 )) - j2se_vendor="oracle" - j2se_title="Java(TM) JRE, Standard Edition, Oracle(TM)" + if read_yn "Is this correct [Y/n]: "; then + j2se_found=true + j2se_required_space=$(( $j2se_expected_min_size * 2 + 20 )) + j2se_vendor="oracle" + j2se_title="Java(TM) JRE, Standard Edition, Oracle(TM)" - j2se_install=oracle_j2re_install - j2se_remove=oracle_j2re_remove - j2se_jinfo=oracle_j2re_jinfo - oracle_jre_bin_hl="java javaws keytool orbd pack200 rmid rmiregistry servertool tnameserv unpack200 policytool" - oracle_jre_bin_jre="javaws policytool" - oracle_no_man_jre_bin_jre="ControlPanel" - oracle_jre_lib_hl="jexec" - j2re_run - fi + j2se_install=oracle_j2re_install + j2se_remove=oracle_j2re_remove + j2se_jinfo=oracle_j2re_jinfo + oracle_jre_bin_hl="java javaws keytool orbd pack200 rmid rmiregistry servertool tnameserv unpack200 policytool" + oracle_jre_bin_jre="javaws policytool" + oracle_no_man_jre_bin_jre="ControlPanel" + oracle_jre_lib_hl="jexec" + j2re_run + fi fi } oracle_j2re_install() { - cat << EOF + cat << EOF if [ ! -e "$jvm_base$j2se_name/debian/info" ]; then exit 0 fi @@ -73,7 +73,7 @@ EOF } oracle_j2re_remove() { - cat << EOF + cat << EOF if [ ! -e "$jvm_base$j2se_name/debian/info" ]; then exit 0 fi