aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortarek <none@none>2009-07-22 17:06:50 +0200
committertarek <none@none>2009-07-22 17:06:50 +0200
commit25cd11318c2884aa281941d1e0526d9b063a69a6 (patch)
tree95eba33fbd9f299448433fd1c000f09251cc872e
parentfed48908d94950852993e46db8b469ecf9094618 (diff)
downloadexternal_python_setuptools-25cd11318c2884aa281941d1e0526d9b063a69a6.tar.gz
external_python_setuptools-25cd11318c2884aa281941d1e0526d9b063a69a6.tar.bz2
external_python_setuptools-25cd11318c2884aa281941d1e0526d9b063a69a6.zip
using boostrap.py name for ez_setup.py because that is what it is
--HG-- branch : distribute extra : rebase_source : 2398b9d16b2cda1f2c20c6eff792f49fb59c8cbd
-rwxr-xr-xREADME.txt16
-rw-r--r--[-rwxr-xr-x]bootstrap.py (renamed from ez_setup.py)0
-rwxr-xr-xsetup.py2
3 files changed, 9 insertions, 9 deletions
diff --git a/README.txt b/README.txt
index 2e552e48..dc6fead4 100755
--- a/README.txt
+++ b/README.txt
@@ -23,20 +23,20 @@ are available at the PyPI page and here :
http://bitbucket.org/tarek/distribute/downloads.
It can be installed using easy_install or pip, with the source tarball, with the
-eggs distribution, or using the ``distribute.py`` script provided online.
+eggs distribution, or using the ``bootstrap.py`` script provided online.
-``distribute.py`` is the simplest and preferred way on all systems.
+``bootstrap.py`` is the simplest and preferred way on all systems.
-distribute.py
-=============
+bootstrap.py
+============
-Download ``distribute.py`` and execute it, using the Python interpreter of
+Download ``bootstrap.py`` and execute it, using the Python interpreter of
your choice.
If your shell has the `wget` programm you can do::
- $ wget http://bitbucket.org/tarek/distribute/downloads/distribute.py
- $ python distribute.py
+ $ wget http://bitbucket.org/tarek/distribute/downloads/bootstrap.py
+ $ python bootstrap.py
easy_install or pip
===================
@@ -100,7 +100,7 @@ Windows
-------
Don't install Distribute trying to execute the egg, because it's aimed to
-sh-based shells. Instead, use the ``distribute.py`` method, that will
+sh-based shells. Instead, use the ``bootstrap.py`` method, that will
download the egg for you, then install the egg.
---------------------------
diff --git a/ez_setup.py b/bootstrap.py
index a069c95c..a069c95c 100755..100644
--- a/ez_setup.py
+++ b/bootstrap.py
diff --git a/setup.py b/setup.py
index c2788314..be15f6b4 100755
--- a/setup.py
+++ b/setup.py
@@ -16,7 +16,7 @@ scripts = []
# if we are installing Distribute using "python setup.py install"
# we need to get setuptools out of the way
if 'install' in sys.argv[1:]:
- from ez_setup import fake_setuptools
+ from bootstrap import fake_setuptools
fake_setuptools()
setup(