summaryrefslogtreecommitdiff
path: root/libre
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2014-09-09 21:16:06 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2014-09-09 21:16:06 -0300
commit3876ca5cbf1f38fbbe218226eac46ec581dc3bb4 (patch)
treee1bc8ebd0ccac8c998a16abce2ea61243b5693f7 /libre
parentc0abb6309d520012d8927aefb96405c0eb5ebdcf (diff)
java-common: do not try to set/fix links
Diffstat (limited to 'libre')
-rw-r--r--libre/java-common/PKGBUILD2
-rw-r--r--libre/java-common/install_java-common.sh39
2 files changed, 1 insertions, 40 deletions
diff --git a/libre/java-common/PKGBUILD b/libre/java-common/PKGBUILD
index 8d29576e8..88d3f66a0 100644
--- a/libre/java-common/PKGBUILD
+++ b/libre/java-common/PKGBUILD
@@ -2,7 +2,7 @@
# Maintainer: André Silva <emulatorman@parabola.nu>
pkgname=java-common
pkgver=1
-pkgrel=7.parabola1
+pkgrel=8.parabola1
pkgdesc='Common files for Java Environments (Parabola rebranded)'
arch=('any')
url='parabolagnulinux.org'
diff --git a/libre/java-common/install_java-common.sh b/libre/java-common/install_java-common.sh
index 5ba935e2b..c9910e8bf 100644
--- a/libre/java-common/install_java-common.sh
+++ b/libre/java-common/install_java-common.sh
@@ -1,43 +1,4 @@
-JVM_DIR=/usr/lib/jvm
-OLD_DEFAULT_NAME=java-default-runtime
-OLD_DEFAULT_PATH=${JVM_DIR}/${OLD_DEFAULT_NAME}
-DEFAULT_NAME=default
-DEFAULT_PATH=${JVM_DIR}/${DEFAULT_NAME}
-DEFAULT_NAME_JRE=default-runtime
-DEFAULT_PATH_JRE=${JVM_DIR}/${DEFAULT_NAME_JRE}
-
-# $1: Java environment name to set as default
-set_default_link_to() {
- new_default=$1
- unlink ${DEFAULT_PATH} 2>/dev/null
- ln -sf ${new_default} ${DEFAULT_PATH}
-
- unlink ${DEFAULT_PATH_JRE} 2>/dev/null
- if [[ ${new_default} == */jre ]]; then
- ln -sf ${new_default} ${DEFAULT_PATH_JRE}
- else
- ln -sf ${new_default}/jre ${DEFAULT_PATH_JRE}
- fi
-}
-
-pre_install() {
- _curr_def=$(readlink ${OLD_DEFAULT_PATH} && true)
- if [ -n "${_curr_def}" ]; then
- unlink ${OLD_DEFAULT_PATH} > /dev/null 2>&1
- ln -sf ${DEFAULT_NAME} ${OLD_DEFAULT_PATH}
-
- set_default_link_to ${_curr_def}
- fi
-}
-
-pre_upgrade() {
- pre_install "$@"
-}
-
post_install() {
- echo 'Installing multiple non-conflicting Java environments is now supported'
- echo 'Check the following wiki section for more info:'
- echo ' https://wiki.parabolagnulinux.org/index.php/Java'
echo 'Please make sure JAVA_HOME is set to /usr/lib/jvm/default'
echo 'If not, you may have to logout and login again to set it according to /etc/profile.d/jre.sh'
}