Create symlink automatically for packaging

Makefile

@@ -3,7 +3,7 @@
 TESTS = git svn crlf strange
 TESTPYPI = http://testpypi.python.org/pypi
 
-.PHONY: dogfood test $(TESTS) clean dist
+.PHONY: dogfood test $(TESTS) clean dist-test dist
 
 dogfood:
 	src/cdiff.py -s
@@ -21,14 +21,11 @@ $(TESTS):
 	python3 src/cdiff.py tests/$@.diff | diff -u tests/$@.diff -
 
 clean:
-	rm -rf MANIFEST build/ cdiff.egg-info/ dist/
+	rm -rf src/cdiff MANIFEST build/ cdiff.egg-info/ dist/
 
 dist-test:
 	./setup.py build sdist upload -r $(TESTPYPI)
 
-install-test:
-	pip install -r $(TESTPYPI)
-
 dist:
 	./setup.py build sdist upload
 

README.rst

@@ -16,32 +16,37 @@ with **auto pager**.  Requires python (>= 2.5.0) and ``less``.
 Installation
 ------------
 
-Cdiff is not in PyPI yet, so far you could download the script directly or use
-the ``setup.py`` to install.
- 
-**Download directly**
+**Install with pip**
 
-Save `src/cdiff.py <https://raw.github.com/ymattw/cdiff/master/src/cdiff.py>` to
-whatever directory which is in your ``$PATH``, for example, ``$HOME/bin`` is in
-my ``$PATH``, so I save the script there and name as ``cdiff``.
+Cdiff is already listed on `PyPI <http://pypi.python.org/pypi/cdiff>`, you can
+install with ``pip`` if you have the tool.
 
-.. code:: shell
-
-    curl -ksS https://raw.github.com/ymattw/cdiff/master/src/cdiff.py > ~/bin/cdiff
-    chmod +x ~/bin/cdiff
+.. code:: sh
+ 
+    sudo pip install cdiff
 
-**Install with the setup.py**
+**Install with setup.py**
 
-You can run the setup.py from the source to install ``cdiff`` to system wide
-directory.
+You can also run the setup.py from the source if you don't have ``pip``.
 
-.. code:: shell
+.. code:: sh
 
     git clone https://github.com/ymattw/cdiff.git
     cd cdiff
     sudo ./setup.py install
 
-This usually installs it as ``/usr/local/bin/cdiff``.
+**Download directly**
+
+Both ``pip`` and ``setup.py`` installs cdiff to system wide directory, if you
+want a minimal tool without the boring external dependencies (like me), just
+save `src/cdiff.py <https://raw.github.com/ymattw/cdiff/master/src/cdiff.py>` to
+whatever directory which is in your ``$PATH``, for example, ``$HOME/bin`` is
+in my ``$PATH``, so I save the script there and name as ``cdiff``.
+
+.. code:: sh
+
+    curl -ksS https://raw.github.com/ymattw/cdiff/master/src/cdiff.py > ~/bin/cdiff
+    chmod +x ~/bin/cdiff
 
 Usage
 -----
@@ -57,7 +62,7 @@ Show usage::
 
 View a diff (patch) file:
 
-.. code:: shell
+.. code:: sh
 
     cdiff foo.patch             # view colored incremental udiff
     cdiff foo.patch -s          # view side by side
@@ -65,7 +70,7 @@ View a diff (patch) file:
 
 Read diff from local modification in a svn, git, or hg workspace:
 
-.. code:: shell
+.. code:: sh
 
     cd proj-workspace
     cdiff
@@ -74,15 +79,15 @@ Read diff from local modification in a svn, git, or hg workspace:
 
 Pipe in a diff:
 
-.. code:: shell
+.. code:: sh
 
-    svn diff -r PREV | cdiff -s
     git log -p -2 | cdiff -s
-    git show <commit> | cdiff -s
+    git show 15bfa56 | cdiff -s
+    svn diff -r PREV | cdiff -s
 
 Redirect output to another patch file is safe:
 
-.. code:: shell
+.. code:: sh
 
     svn diff | cdiff -s > my.patch
 

setup.py

@@ -2,13 +2,20 @@
 
 from __future__ import with_statement
 from distutils.core import setup
+import os
+
+# Create symlink so that to use 'scripts' w/o '.py'
+link_name = 'src/cdiff'
+if os.path.exists(link_name):
+    os.unlink(link_name)
+os.symlink('cdiff.py', 'src/cdiff')
 
 with open('README.rst') as doc:
     long_description = doc.read()
 
 setup(
     name = 'cdiff',
-    version = '0.0.1',
+    version = '0.0.2',
     author = 'Matthew Wang',
     author_email = 'mattwyl@gmail.com',
     license = 'BSD-3',

src/cdiff

@@ -1 +0,0 @@
-cdiff.py