--- python.eselect-20090801 +++ python.eselect-20090801 @@ -27,10 +27,12 @@ set_python_script() { local script="${INTERPRETER_PATH}${1}" target="${2}" cat << EOF > "${script}" -#!/bin/bash +#!/bin/sh # Gentoo Python wrapper script -[[ "\${EPYTHON}" =~ (/|^python\$) ]] && EPYTHON="${target}" +case "\${EPYTHON}" in + */*|python) EPYTHON="${target}";; +esac "\${0%/*}/\${EPYTHON:-${target}}" "\$@" EOF chmod +x "${script}" @@ -39,12 +41,17 @@ set_python_config_script() { local script="${INTERPRETER_PATH}${1}" target="${2}" cat << EOF > "${script}" -#!/bin/bash +#!/bin/sh # Gentoo python-config wrapper script -[[ "\${EPYTHON}" =~ (/|^python\$) ]] && EPYTHON="${target/-config-/}" -python_config="\${EPYTHON/python/python-config-}" -"\${0%/*}/\${python_config:-${target}}" "\$@" +case "\${EPYTHON}" in + */*|python) EPYTHON="${target/-config-/}";; +esac +: \${python_config:=${target}} +case "\${EPYTHON}" in *python*) + python_config="\${EPYTHON%%python*}python-config-\${EPYTHON#*python}";; +esac +"\${0%/*}/\${python_config}" "\$@" EOF chmod +x "${script}" }