[gentoo-python] Re: [PATCH] Introduce python_newscript().

[Mike Gilbert <floppym@gentoo.org>]

On Fri, Feb 1, 2013 at 8:46 PM, Michał Górny <mgorny@gentoo.org> wrote:
> Requested by jlec, I think.
> ---
>  gx86/eclass/python-utils-r1.eclass | 47 ++++++++++++++++++++++++++++++--------
>  1 file changed, 37 insertions(+), 10 deletions(-)
>
> diff --git a/gx86/eclass/python-utils-r1.eclass b/gx86/eclass/python-utils-r1.eclass
> index b425302..c5a1f6e 100644
> --- a/gx86/eclass/python-utils-r1.eclass
> +++ b/gx86/eclass/python-utils-r1.eclass
> @@ -521,7 +521,34 @@ python_scriptinto() {
>  python_doscript() {
>         debug-print-function ${FUNCNAME} "${@}"
>
> +       local f
> +       for f; do
> +               python_newscript "${f}" "${f}"
> +       done
> +}


Won't this break on something like "python_doscript path/to/script"?
That would result in this call:

python_newscript path/to/script path/to/script

If I'm reading python_newscript correctly, $2 should not have any path
information.

> +
> +# @FUNCTION: python_newscript
> +# @USAGE: <path> <new-name>
> +# @DESCRIPTION:
> +# Install the given script into current python_scriptroot
> +# for the current Python implementation (${EPYTHON}), and name it
> +# <new-name>.
> +#
> +# The file must start with a 'python' shebang. The shebang will be
> +# converted, the file will be renamed to be EPYTHON-suffixed
> +# and a wrapper will be installed in place of the <new-name>.
> +#
> +# Example:
> +# @CODE
> +# src_install() {
> +#   python_foreach_impl python_newscript foo.py foo
> +# }
> +# @CODE
> +python_newscript() {
> +       debug-print-function ${FUNCNAME} "${@}"
> +
>         [[ ${EPYTHON} ]] || die 'No Python implementation set (EPYTHON is null).'
> +       [[ ${#} -eq 2 ]] || die "Usage: ${FUNCNAME} <path> <new-name>"
>
>         local d=${python_scriptroot:-${DESTTREE}/bin}
>         local INSDESTTREE INSOPTIONS
> @@ -529,18 +556,18 @@ python_doscript() {
>         insinto "${d}"
>         insopts -m755
>
> -       local f
> -       for f; do
> -               local oldfn=${f##*/}
> -               local newfn=${oldfn}-${EPYTHON}
> +       local f=${1}
> +       local barefn=${2}
>
> -               debug-print "${FUNCNAME}: ${oldfn} -> ${newfn}"
> -               newins "${f}" "${newfn}" || die
> -               _python_rewrite_shebang "${ED}/${d}/${newfn}"
> +       local oldfn=${f##*/}
> +       local newfn=${barefn}-${EPYTHON}
>
> -               # install the wrapper
> -               _python_ln_rel "${ED}"/usr/bin/python-exec "${ED}/${d}/${oldfn}" || die
> -       done
> +       debug-print "${FUNCNAME}: ${oldfn} -> ${newfn}"
> +       newins "${f}" "${newfn}" || die
> +       _python_rewrite_shebang "${ED}/${d}/${newfn}"
> +
> +       # install the wrapper
> +       _python_ln_rel "${ED}"/usr/bin/python-exec "${ED}/${d}/${barefn}" || die
>  }
>
>  # @ECLASS-VARIABLE: python_moduleroot
> --
> 1.8.1.2
>