[CalendarServer-changes] [14420] CalendarServer/trunk/bin/_py.sh

[source_changes at macosforge.org]

Revision: 14420
          http://trac.calendarserver.org//changeset/14420
Author:   wsanchez at apple.com
Date:     2015-02-16 16:48:41 -0800 (Mon, 16 Feb 2015)
Log Message:
-----------
Get rid of hard-coded paths. Look for pypy.

Modified Paths:
--------------
    CalendarServer/trunk/bin/_py.sh

Modified: CalendarServer/trunk/bin/_py.sh
===================================================================
--- CalendarServer/trunk/bin/_py.sh	2015-02-17 00:08:14 UTC (rev 14419)
+++ CalendarServer/trunk/bin/_py.sh	2015-02-17 00:48:41 UTC (rev 14420)
@@ -61,27 +61,18 @@
 # Detect which version of Python to use, then print out which one was detected.
 #
 # This will prefer the python interpreter in the PYTHON environment variable.
-# If that's not found, it will check for "python2.7", "python2.6" and "python",
-# looking for each in your PATH and, failing that, in a number of well-known
-# locations.
+# If that's not found, it will check for "python2.7" and "python", looking for
+# each in your PATH.
 #
 detect_python_version () {
   local v;
   local p;
-  for v in "2.7" "2.6" ""
+  for v in "2.7" ""
   do
-    for p in                                                            \
-      "${PYTHON:=}"                                                     \
-      "python${v}"                                                      \
-      "/usr/local/bin/python${v}"                                       \
-      "/usr/local/python/bin/python${v}"                                \
-      "/usr/local/python${v}/bin/python${v}"                            \
-      "/opt/bin/python${v}"                                             \
-      "/opt/python/bin/python${v}"                                      \
-      "/opt/python${v}/bin/python${v}"                                  \
-      "/Library/Frameworks/Python.framework/Versions/${v}/bin/python"   \
-      "/opt/local/bin/python${v}"                                       \
-      "/sw/bin/python${v}"                                              \
+    for p in         \
+      "${PYTHON:=}"  \
+      "pypy${v}"     \
+      "python${v}"   \
       ;
     do
       if p="$(find_cmd "${p}")"; then
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150216/9009ce7a/attachment.html>