diff options
author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2014-10-13 04:38:47 -0200 |
---|---|---|
committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2014-10-13 04:38:47 -0200 |
commit | d57bb5f6dc5b4fad213ccdcfa4bfd321d9a84caf (patch) | |
tree | 71dc69905e5f2a73bcc8cc619cf6dc53bbd14ed5 /libre/java8-openjdk/install_jre8-openjdk.sh | |
parent | 07ac33c000c046df51de1b1249c74ef5fbe307a5 (diff) |
java8-openjdk-8.u20-4.parabola1: use new java-*-common scripts. rewrite install scripts
Diffstat (limited to 'libre/java8-openjdk/install_jre8-openjdk.sh')
-rw-r--r-- | libre/java8-openjdk/install_jre8-openjdk.sh | 60 |
1 files changed, 35 insertions, 25 deletions
diff --git a/libre/java8-openjdk/install_jre8-openjdk.sh b/libre/java8-openjdk/install_jre8-openjdk.sh index ab17eebcb..a5faaf0af 100644 --- a/libre/java8-openjdk/install_jre8-openjdk.sh +++ b/libre/java8-openjdk/install_jre8-openjdk.sh @@ -1,35 +1,50 @@ -this_java='java-8-openjdk/jre' +THIS_JRE='java-8-openjdk/jre' + +fix_default() { + if [ ! -x /usr/bin/java ]; then + /usr/bin/parabola-java unset + echo "" + else + /usr/bin/parabola-java get + fi +} post_install() { + default=$(fix_default) + case ${default} in + "") + /usr/bin/parabola-java set ${THIS_JRE} + ;; + ${THIS_JRE} | ${THIS_JRE/\/jre}) + # Nothing + ;; + *) + echo "Default Java environment is already set to '${default}'" + echo "See 'parabola-java help' to change it" + ;; + esac + xdg-icon-resource forceupdate --theme hicolor 2> /dev/null - echo "when you use a non-reparenting window manager" - echo "set _JAVA_AWT_WM_NONREPARENTING=1 in" - echo "/etc/profile.d/jre.sh" + echo "when you use a non-reparenting window manager," + echo "set _JAVA_AWT_WM_NONREPARENTING=1 in /etc/profile.d/jre.sh" # update-desktop-database -q - - default=$(/usr/bin/parabola-java get) - if [ -z "${default}" ]; then - /usr/bin/parabola-java set ${this_java} - elif [ "${default/\/jre}" = "${this_java/\/jre}" ]; then - /usr/bin/parabola-java fix - else - echo "Default Java environment is already set to '${default}'" - echo "To set '${this_java}' as default, consider using:" - echo " parabola-java set '${this_java}'" - fi } post_upgrade() { + if [ -z $(fix_default) ]; then + /usr/bin/parabola-java set ${THIS_JRE} + fi + xdg-icon-resource forceupdate --theme hicolor 2> /dev/null # update-desktop-database -q +} - default=$(/usr/bin/parabola-java get) - if [ -z "${default}" ]; then - /usr/bin/parabola-java set ${this_java} - elif [ "${default/\/jre}" = "${this_java/\/jre}" ]; then - /usr/bin/parabola-java fix +pre_remove() { + if [ "x$(fix_default)" = "x${THIS_JRE/\/jre}" ]; then + /usr/bin/parabola-java unset + echo "No Java environment is set as default anymore" fi } @@ -37,9 +52,4 @@ post_remove() { xdg-icon-resource forceupdate --theme hicolor 2> /dev/null # update-desktop-database -q - - default=$(/usr/bin/parabola-java get) - if [ "${default/\/jre}" = "${this_java/\/jre}" ]; then - /usr/bin/parabola-java fix - fi } |