From b1d32217c3f5ccdc215e8f0ed42a7e5c4ebf493e Mon Sep 17 00:00:00 2001
From: "Yamashita, Yuu" <peek824545201@gmail.com>
Date: Sun, 13 Aug 2017 20:01:29 +0900
Subject: [PATCH] Avoid creating a symlink for symlink

---
 plugins/python-build/bin/python-build | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/plugins/python-build/bin/python-build b/plugins/python-build/bin/python-build
index 814ae57f..1037006d 100755
--- a/plugins/python-build/bin/python-build
+++ b/plugins/python-build/bin/python-build
@@ -985,21 +985,16 @@ pyston_architecture() {
 build_package_pypy() {
   build_package_copy
   mkdir -p "${PREFIX_PATH}/bin" "${PREFIX_PATH}/lib"
-  local pypy libpypy python
+  local bin
   shopt -s nullglob
   for bin in "bin/"*; do
-    if [ -f "${bin}" ]; then
+    if [ -f "${bin}" ] && [ -x "${bin}" ] && [ ! -L "${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##*/}" )
+        ( cd "${PREFIX_PATH}/bin" && ln -fs "${bin##*/}" "python" )
         ;;
       esac
     fi
@@ -1023,13 +1018,15 @@ build_package_pypy_builder() {
     return 1
   fi
   { mkdir -p "bin" "lib"
+    local pypy
     for pypy in "pypy"*; do
-      if [ -f "${pypy}" ]; then
+      if [ -f "${pypy}" ] && [ -x "${pypy}" ] && [ ! -L "${pypy}" ]; then
         mv -f "${pypy}" "bin/${pypy##*/}"
       fi
     done
+    local libpypy
     for libpypy in "libpypy"*; do
-      if [ -f "${libpypy}" ]; then
+      if [ -f "${libpypy}" ] && [ -x "${libpypy}" ] && [ ! -L "${libpypy}" ]; then
         mv -f "${libpypy}" "bin/${libpypy##*/}"
       fi
     done