diff options
| author |   Thomas Matthijs <axxo@gentoo.org> | 2005-10-09 18:09:40 +0000 |
|---|---|---|
| committer | Thomas Matthijs <axxo@gentoo.org> | 2005-10-09 18:09:40 +0000 |
| commit | 11a9520e82ba5e7c2a61b3d436e22e1b899a6df1 (patch) | |
| tree | 2f15c52fa7eb5f9d431b0a85a3ac892b42bdebc0 /src | |
| parent | ## (diff) | |
| download | java-config-11a9520e82ba5e7c2a61b3d436e22e1b899a6df1.tar.gz java-config-11a9520e82ba5e7c2a61b3d436e22e1b899a6df1.tar.bz2 java-config-11a9520e82ba5e7c2a61b3d436e22e1b899a6df1.zip | |
Move location of the vm symlink, and symlink too JAVA_HOME
svn path=/java-config-ng/branches/axxo/; revision=991
Diffstat (limited to 'src')
| -rw-r--r-- | src/env | 12 | ||||
| -rw-r--r-- | src/eselect/java.eselect | 6 | ||||
| -rw-r--r-- | src/java_config/EnvironmentManager.py | 4 | ||||
| -rw-r--r-- | src/run-java-tool | 13 |
4 files changed, 14 insertions, 21 deletions
diff --git a/src/env b/src/env deleted file mode 100644 index ef6962b..0000000 --- a/src/env +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash -#Too be sourced - -if [[ -n ${GENTOO_VM} ]]; then - vmpath=/etc/java-config/vms/${GENTOO_VM} -elif [[ -h ${HOME}/.gentoo/user-vm ]]; then - vmpath=${HOME}/.gentoo/user-vm -else - vmpath=/etc/java-config/vms/system-vm -fi - -[[ -f ${vmpath}/env ]] && source ${vmpath}/env diff --git a/src/eselect/java.eselect b/src/eselect/java.eselect index 74847f4..09f1275 100644 --- a/src/eselect/java.eselect +++ b/src/eselect/java.eselect @@ -9,14 +9,14 @@ MAINTAINER="axxo@gentoo.org" SVN_DATE='$Date: $' VERSION=$(svn_date_to_version "${SVN_DATE}" ) -VM_BASE=${ROOT}/etc/java-config/vms -VM_SYSTEM=${VM_BASE}/system-vm +VM_BASE=/usr/lib/jvm/ +VM_SYSTEM=/etc/java-config/system-vm VM_USER=${HOME}/.gentoo/user-vm find_targets() { local f for f in ${VM_BASE}/* ; do - [[ -d ${f} && ! -L ${f} ]] && echo $(basename ${f}) + [[ -L ${f} ]] && echo $(basename ${f}) done } diff --git a/src/java_config/EnvironmentManager.py b/src/java_config/EnvironmentManager.py index 5e8e21e..ef04448 100644 --- a/src/java_config/EnvironmentManager.py +++ b/src/java_config/EnvironmentManager.py @@ -182,7 +182,7 @@ class EnvironmentManager: if os.path.islink(target): os.remove(target) - os.symlink('/etc/java-config/vms/'+vm.name(),target) + os.symlink('/usr/lib/jvm/'+vm.name(),target) def vm_links(self): return [ self.user_vm_link(), self.system_vm_link() ] @@ -191,7 +191,7 @@ class EnvironmentManager: return os.path.join(os.environ.get('HOME'), '.gentoo/user-vm') def system_vm_link(self): - return '/etc/java-config/vms/system-vm' + return '/etc/java-config/system-vm' def clean_classpath(self, targets): for target in targets: diff --git a/src/run-java-tool b/src/run-java-tool index 811fa94..21f4768 100644 --- a/src/run-java-tool +++ b/src/run-java-tool @@ -1,18 +1,23 @@ #!/bin/bash if [[ -n ${GENTOO_VM} ]]; then - vmpath=/etc/java-config/vms/${GENTOO_VM}/ + vmpath=/usr/lib/jvm/${GENTOO_VM}/ elif [[ -h ${HOME}/.gentoo/user-vm ]]; then vmpath=${HOME}/.gentoo/user-vm/ else - vmpath=/etc/java-config/vms/system-vm/ + vmpath=/etc/java-config/system-vm/ fi tool=$(basename $0) bin=${vmpath}/bin/${tool} +jrebin=${vmpath}/jre/bin/${tool} -if [[ -x ${bin} ]]; then +if [[ -x ${bin} ]]; then exec ${bin} "${@}" +elif [[ -x ${jrebin} ]]; then + exec ${jrebin} "${@}" else - echo "Want too run ${bin} but it does not exist or is not executable" >&2 + echo "Want too run ${vmpath}/{,jre}/bin/${tool} but it does not exist or is not executable" >&2 exit 1 fi + + |