diff options
| author |   Ralph Sennhauser <sera@gentoo.org> | 2013-02-12 19:20:34 +0000 |
|---|---|---|
| committer | Ralph Sennhauser <sera@gentoo.org> | 2013-02-12 19:20:34 +0000 |
| commit | be249aec4a55dee0e839533ddcbded3d3bfbf5d5 (patch) | |
| tree | 50c63c9af065bc9e828d89ed5ea36f02aaa13f1b | |
| parent | Prefixify install paths (diff) | |
| download | java-config-be249aec4a55dee0e839533ddcbded3d3bfbf5d5.tar.gz java-config-be249aec4a55dee0e839533ddcbded3d3bfbf5d5.tar.bz2 java-config-be249aec4a55dee0e839533ddcbded3d3bfbf5d5.zip | |
Add remaining Prefix stuff
svn path=/projects/java-config-2/trunk/; revision=9205
| -rw-r--r-- | src/java_config_2/VersionManager.py | 6 | ||||
| -rw-r--r-- | src/launcher.bash | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/java_config_2/VersionManager.py b/src/java_config_2/VersionManager.py index 047c6f6..c37b0f1 100644 --- a/src/java_config_2/VersionManager.py +++ b/src/java_config_2/VersionManager.py @@ -54,12 +54,12 @@ class VersionManager: atom_parser = re.compile(r"([<>=]*)virtual/(jre|jdk)[-:]([0-9\.*]+)") virtuals_parser = re.compile(r"([<>=~]+)?java-virtuals/([\w\-\.:]+)") package_parser = re.compile(r"([\w\-]+)/([\w\-]+)(?:\:(\d+))?") - user_pref_file = '/etc/java-config-2/build/jdk.conf' - default_pref_file = '/usr/share/java-config-2/config/jdk-defaults.conf' - _prefs = None def __init__(self, env_manager): self.env_manager = env_manager + self.user_pref_file = env_manager.eprefix + '/etc/java-config-2/build/jdk.conf' + self.default_pref_file = env_manager.eprefix + '/usr/share/java-config-2/config/jdk-defaults.conf' + self._prefs = None def get_prefs(self): if self._prefs: diff --git a/src/launcher.bash b/src/launcher.bash index 1d717be..3d77757 100644 --- a/src/launcher.bash +++ b/src/launcher.bash @@ -21,8 +21,8 @@ unset GENTOO_PYTHON_TARGET_SCRIPT_PATH_VERIFICATION # Source package env # --------------------- -gjl_user_env="${HOME}/.gentoo/java-config-2/launcher.d/${gjl_package}" -gjl_system_env="/etc/java-config-2/launcher.d/${gjl_package}" +gjl_user_env="${HOME}/.gentoo@GENTOO_PORTAGE_EPREFIX@/java-config-2/launcher.d/${gjl_package}" +gjl_system_env="@GENTOO_PORTAGE_EPREFIX@/etc/java-config-2/launcher.d/${gjl_package}" if [[ -f "${gjl_user_env}" ]]; then source "${gjl_user_env}" elif [[ -f "${gjl_system_env}" ]]; then |