| 1 |
Minor fix: |
| 2 |
|
| 3 |
Dnia 2013-09-15, o godz. 11:03:26 |
| 4 |
Michał Górny <mgorny@g.o> napisał(a): |
| 5 |
|
| 6 |
> @@ -756,20 +756,30 @@ python_newscript() { |
| 7 |
> [[ ${#} -eq 2 ]] || die "Usage: ${FUNCNAME} <path> <new-name>" |
| 8 |
> |
| 9 |
> local d=${python_scriptroot:-${DESTTREE}/bin} |
| 10 |
> + local wrapd=${d} |
| 11 |
> |
| 12 |
> local f=${1} |
| 13 |
> local barefn=${2} |
| 14 |
> + local newfn |
| 15 |
> |
| 16 |
> - local newfn=${barefn}-${EPYTHON} |
| 17 |
> + if _python_want_python_exec2; then |
| 18 |
> + local PYTHON_SCRIPTDIR |
| 19 |
> + python_export PYTHON_SCRIPTDIR |
| 20 |
> + d=${PYTHON_SCRIPTDIR#${EPREFIX}} |
| 21 |
> + newfn=${barefn} |
| 22 |
> + else |
| 23 |
> + newfn=${barefn}-${EPYTHON} |
| 24 |
> + fi |
| 25 |
> |
| 26 |
> ( |
| 27 |
> + dodir "${wrapd}" |
| 28 |
> exeinto "${d}" |
| 29 |
> newexe "${f}" "${newfn}" || die |
| 30 |
> ) |
| 31 |
> _python_rewrite_shebang "${ED%/}/${d}/${newfn}" |
| 32 |
> |
| 33 |
> # install the wrapper |
| 34 |
> - _python_ln_rel "${ED%/}"/usr/bin/python-exec \ |
| 35 |
> + _python_ln_rel "${ED%/}"$(_python_get_wrapper_path) \ |
| 36 |
> "${ED%/}/${d}/${barefn}" || die |
| 37 |
^^^^ ${wrapd} needs to go here. |
| 38 |
|
| 39 |
-- |
| 40 |
Best regards, |
| 41 |
Michał Górny |
Archives