diff options
| author | coadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu> | 2014-09-10 00:25:35 -0300 |
|---|---|---|
| committer | coadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu> | 2014-09-10 00:25:35 -0300 |
| commit | 27482f74a68e1c71c46fceb03da3d2866dabb748 (patch) | |
| tree | 34d40c8250958fdda42f1b172b660042f11a4388 /libre/java-common | |
| parent | 5b1fe8d60e17695e59916bcb8d5bbf16f6fe5e29 (diff) | |
| parent | 693de237f790f2c8d0a468dcafc2727fac69bd36 (diff) | |
Merge branch 'master' of ssh://lukeshu.com:1863/srv/git/mirror/parabola/abslibre
Diffstat (limited to 'libre/java-common')
| -rw-r--r-- | libre/java-common/PKGBUILD | 2 | ||||
| -rw-r--r-- | libre/java-common/install_java-common.sh | 39 |
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' } |