require 'formula' class Pip &1`.match('Python (\d+\.\d+)').captures.at(0) dest.install('pip') cp 'pip.egg-info/PKG-INFO', "#{dest}/pip-#{version}-py#{python_version}.egg-info" end def two_line_instructions "pip installs packages. Python packages.\n"+ "Run 'pip help' to see a list of commands." end def caveats # I'm going to add a proper two_line_instructions formula function at some point two_line_instructions end end __END__ diff --git a/pip/baseparser.py b/pip/baseparser.py index 149c52d..82ffa46 100755 --- a/pip/baseparser.py +++ b/pip/baseparser.py @@ -186,7 +186,7 @@ parser.add_option( '--local-log', '--log-file', dest='log_file', metavar='FILENAME', - default=default_log_file, + default=os.path.expanduser(os.path.join('~', 'Library', 'Logs', 'pip.log')), help=optparse.SUPPRESS_HELP) parser.add_option( diff --git a/pip/locations.py b/pip/locations.py index bd70d92..e517292 100755 --- a/pip/locations.py +++ b/pip/locations.py @@ -4,19 +4,20 @@ import sys import os from distutils import sysconfig +user_dir = os.path.expanduser('~') + if getattr(sys, 'real_prefix', None): ## FIXME: is build/ a good name? build_prefix = os.path.join(sys.prefix, 'build') src_prefix = os.path.join(sys.prefix, 'src') else: - ## FIXME: this isn't a very good default - build_prefix = os.path.join(os.getcwd(), 'build') - src_prefix = os.path.join(os.getcwd(), 'src') + build_prefix = user_dir + '/.pip/build' + src_prefix = user_dir + '/.pip/sources' # FIXME doesn't account for venv linked to global site-packages site_packages = sysconfig.get_python_lib() -user_dir = os.path.expanduser('~') + if sys.platform == 'win32': bin_py = os.path.join(sys.prefix, 'Scripts') # buildout uses 'bin' on Windows too?