setop/pyenv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid creating a symlink for symlink

Browse Source
This commit is contained in:
Yamashita, Yuu 2017-08-13 20:01:29 +09:00
parent 8b0ec441da
commit b1d32217c3
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
plugins/python-build/bin/python-build
View File

@ -985,21 +985,16 @@ pyston_architecture() {
build_package_pypy() { build_package_pypy() {
build_package_copy build_package_copy
mkdir -p "${PREFIX_PATH}/bin" "${PREFIX_PATH}/lib" mkdir -p "${PREFIX_PATH}/bin" "${PREFIX_PATH}/lib"
local pypy libpypy python local bin
shopt -s nullglob shopt -s nullglob
for bin in "bin/"*; do for bin in "bin/"*; do
if [ -f "${bin}" ]; then if [ -f "${bin}" ] && [ -x "${bin}" ] && [ ! -L "${bin}" ]; then
case "${bin##*/}" in case "${bin##*/}" in
"libpypy"* ) "libpypy"* )
( cd "${PREFIX_PATH}/lib" && ln -fs "../bin/${bin##*/}" "${bin##*/}" ) ( cd "${PREFIX_PATH}/lib" && ln -fs "../bin/${bin##*/}" "${bin##*/}" )
;; ;;
"pypy-stm" )
python="bin/python"
( cd "${PREFIX_PATH}/bin" && ln -fs "${bin##*/}" "${python##*/}" )
;;
"pypy"* ) "pypy"* )
python="$(basename "${bin}" | sed -e 's/pypy/python/')" ( cd "${PREFIX_PATH}/bin" && ln -fs "${bin##*/}" "python" )
( cd "${PREFIX_PATH}/bin" && ln -fs "${bin##*/}" "${python##*/}" )
;; ;;
esac esac
fi fi
@ -1023,13 +1018,15 @@ build_package_pypy_builder() {
return 1 return 1
fi fi
{ mkdir -p "bin" "lib" { mkdir -p "bin" "lib"
local pypy
for pypy in "pypy"*; do for pypy in "pypy"*; do
if [ -f "${pypy}" ]; then if [ -f "${pypy}" ] && [ -x "${pypy}" ] && [ ! -L "${pypy}" ]; then
mv -f "${pypy}" "bin/${pypy##*/}" mv -f "${pypy}" "bin/${pypy##*/}"
fi fi
done done
local libpypy
for libpypy in "libpypy"*; do for libpypy in "libpypy"*; do
if [ -f "${libpypy}" ]; then if [ -f "${libpypy}" ] && [ -x "${libpypy}" ] && [ ! -L "${libpypy}" ]; then
mv -f "${libpypy}" "bin/${libpypy##*/}" mv -f "${libpypy}" "bin/${libpypy##*/}"
fi fi
done done