Browse Source

Check if copying file is a file or not

pull/956/head
Yamashita, Yuu 9 years ago
parent
commit
41f00c639d
1 changed files with 21 additions and 15 deletions
  1. +21
    -15
      plugins/python-build/bin/python-build

+ 21
- 15
plugins/python-build/bin/python-build View File

@ -988,19 +988,21 @@ build_package_pypy() {
local pypy libpypy python local pypy libpypy python
shopt -s nullglob shopt -s nullglob
for bin in "bin/"*; do for bin in "bin/"*; do
case "${bin##*/}" in
"libpypy"* )
( cd "${PREFIX_PATH}/lib" && ln -fs "../bin/${bin##*/}" "${bin##*/}" )
;;
"pypy-stm" )
python="bin/python"
( cd "${PREFIX_PATH}/bin" && ln -fs "${bin##*/}" "${python##*/}" )
;;
"pypy"* )
python="$(basename "${bin}" | sed -e 's/pypy/python/')"
( cd "${PREFIX_PATH}/bin" && ln -fs "${bin##*/}" "${python##*/}" )
;;
esac
if [ -f "${bin}" ]; then
case "${bin##*/}" in
"libpypy"* )
( cd "${PREFIX_PATH}/lib" && ln -fs "../bin/${bin##*/}" "${bin##*/}" )
;;
"pypy-stm" )
python="bin/python"
( cd "${PREFIX_PATH}/bin" && ln -fs "${bin##*/}" "${python##*/}" )
;;
"pypy"* )
python="$(basename "${bin}" | sed -e 's/pypy/python/')"
( cd "${PREFIX_PATH}/bin" && ln -fs "${bin##*/}" "${python##*/}" )
;;
esac
fi
done done
shopt -u nullglob shopt -u nullglob
} }
@ -1022,10 +1024,14 @@ build_package_pypy_builder() {
fi fi
{ mkdir -p "bin" "lib" { mkdir -p "bin" "lib"
for pypy in "pypy"*; do for pypy in "pypy"*; do
mv -f "${pypy}" "bin/${pypy##*/}"
if [ -f "${pypy}" ]; then
mv -f "${pypy}" "bin/${pypy##*/}"
fi
done done
for libpypy in "libpypy"*; do for libpypy in "libpypy"*; do
mv -f "${libpypy}" "bin/${libpypy##*/}"
if [ -f "${libpypy}" ]; then
mv -f "${libpypy}" "bin/${libpypy##*/}"
fi
done done
} >&4 2>&1 } >&4 2>&1
build_package_pypy build_package_pypy

Loading…
Cancel
Save