diff options
author | Alistair Bush <ali_bush@gentoo.org> | 2010-12-13 09:59:39 +0000 |
---|---|---|
committer | Alistair Bush <ali_bush@gentoo.org> | 2010-12-13 09:59:39 +0000 |
commit | 960dafb2cae49b73829bba4375bac0f5c10d6bdf (patch) | |
tree | 1e0ce7c992d718c5510b278ccabd01224c71a0d0 /src | |
parent | Fix python3 error (diff) | |
download | java-config-960dafb2cae49b73829bba4375bac0f5c10d6bdf.tar.gz java-config-960dafb2cae49b73829bba4375bac0f5c10d6bdf.tar.bz2 java-config-960dafb2cae49b73829bba4375bac0f5c10d6bdf.zip |
Add special python handling code to launcher.bash. See #348306.
svn path=/projects/java-config-2/trunk/; revision=8254
Diffstat (limited to 'src')
-rw-r--r-- | src/launcher.bash | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/src/launcher.bash b/src/launcher.bash index 0f67b36..78c9a65 100644 --- a/src/launcher.bash +++ b/src/launcher.bash @@ -6,6 +6,19 @@ abort() { exit 1 } +# Save Python-specific variables for support for Jython +# --------------------- +_EPYTHON="${EPYTHON}" +_GENTOO_PYTHON_PROCESS_NAME="${GENTOO_PYTHON_PROCESS_NAME}" +_GENTOO_PYTHON_WRAPPER_SCRIPT_PATH="${GENTOO_PYTHON_WRAPPER_SCRIPT_PATH}" +_GENTOO_PYTHON_TARGET_SCRIPT_PATH="${GENTOO_PYTHON_TARGET_SCRIPT_PATH}" +_GENTOO_PYTHON_TARGET_SCRIPT_PATH_VERIFICATION="${GENTOO_PYTHON_TARGET_SCRIPT_PATH_VERIFICATION}" +unset EPYTHON +unset GENTOO_PYTHON_PROCESS_NAME +unset GENTOO_PYTHON_WRAPPER_SCRIPT_PATH +unset GENTOO_PYTHON_TARGET_SCRIPT_PATH +unset GENTOO_PYTHON_TARGET_SCRIPT_PATH_VERIFICATION + # Source package env # --------------------- gjl_user_env="${HOME}/.gentoo/java-config-2/launcher.d/${gjl_package}" @@ -54,6 +67,14 @@ if [[ -z ${gjl_starte} ]]; then abort "Dont know what to run :((" fi +# Restore Python-specific variables for support for Jython +# --------------------- +[[ -n ${_EPYTHON} ]] && export EPYTHON="${_EPYTHON}" +[[ -n ${_GENTOO_PYTHON_PROCESS_NAME} ]] && export GENTOO_PYTHON_PROCESS_NAME="${_GENTOO_PYTHON_PROCESS_NAME}" +[[ -n ${_GENTOO_PYTHON_WRAPPER_SCRIPT_PATH} ]] && export GENTOO_PYTHON_WRAPPER_SCRIPT_PATH="${_GENTOO_PYTHON_WRAPPER_SCRIPT_PATH}" +[[ -n ${_GENTOO_PYTHON_TARGET_SCRIPT_PATH} ]] && export GENTOO_PYTHON_TARGET_SCRIPT_PATH="${_GENTOO_PYTHON_TARGET_SCRIPT_PATH}" +[[ -n ${_GENTOO_PYTHON_TARGET_SCRIPT_PATH_VERIFICATION} ]] && export GENTOO_PYTHON_TARGET_SCRIPT_PATH_VERIFICATION="${_GENTOO_PYTHON_TARGET_SCRIPT_PATH_VERIFICATION}" + # Run it # -------- |