[CalendarServer-changes] [12376] twext/trunk/bin/ve_install

[source_changes at macosforge.org]

Revision: 12376
          http://trac.calendarserver.org//changeset/12376
Author:   wsanchez at apple.com
Date:     2014-01-17 11:32:22 -0800 (Fri, 17 Jan 2014)
Log Message:
-----------
More workingness.  No virtualenv.

Modified Paths:
--------------
    twext/trunk/bin/ve_install

Modified: twext/trunk/bin/ve_install
===================================================================
--- twext/trunk/bin/ve_install	2014-01-17 19:22:31 UTC (rev 12375)
+++ twext/trunk/bin/ve_install	2014-01-17 19:32:22 UTC (rev 12376)
@@ -25,22 +25,38 @@
 export tmp="$(mktemp -d -t foo)";
 cd "${tmp}";
 
+
+find_tool ()
+{
+    local tool="$1"; shift;
+    local version="$1"; shift;
+    local cmd;
+
+    for cmd in "${tool}-${py_version}" "${tool}${py_version}"; do
+        if type -p "${cmd}" > /dev/null; then
+            echo "${cmd}";
+            return 0
+        fi;
+    done;
+
+    return 1;
+}
+
+
 for py_version in "2.7" "2.6"; do
 
-    #
-    # pip needs to be installed on the system.
-    #
-    # FIXME: Not *really* but it's a PITA... maybe let's figure that
-    # out.  Later.
-    #
+    easy_install="$(find_tool "easy_install" "${py_version}")";
 
-    if ! type -p "pip-${py_version}" > /dev/null; then
+    sudo "${easy_install}" --upgrade setuptools;
+
+    if ! pip="$(find_tool "pip" "${py_version}")"; then
         sudo "python${py_version}" "${wd}/bin/get_pip";
     fi;
 
-    sudo "pip-${py_version}" install --upgrade pip;
-    sudo "pip-${py_version}" install --upgrade virtualenv;
+    pip="$(find_tool "pip" "${py_version}")";
 
+    sudo "${pip}" install --upgrade pip;
+
 done;
 
 rm -rf "${tmp}";
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/6dd49939/attachment.html>