From 221e31c535b5b33a082e846b543411789c86c87a 2010-11-02 20:18:29
From: Darren Dale <dsdale24@gmail.com>
Date: 2010-11-02 20:18:29
Subject: [PATCH] fix windows post-installation routines with setuptools installed

---

diff --git a/scripts/ipython_win_post_install.py b/scripts/ipython_win_post_install.py
index ad700e7..4f633fc 100755
--- a/scripts/ipython_win_post_install.py
+++ b/scripts/ipython_win_post_install.py
@@ -51,6 +51,9 @@ def install():
             
     # Now move onto setting the Start Menu up
     ipybase = pjoin(scripts, 'ipython')
+    if 'setuptools' in sys.modules:
+        # let setuptools take care of the scripts:
+        ipybase = ipybase + '-script.py'
     workdir = "%HOMEDRIVE%%HOMEPATH%"
 
     link = pjoin(ip_start_menu, 'IPython.lnk')
diff --git a/setup.py b/setup.py
index e4d8e4f..1f4b7db 100755
--- a/setup.py
+++ b/setup.py
@@ -232,8 +232,6 @@ if 'setuptools' in sys.modules:
         test='nose>=0.10.1',
         security='pyOpenSSL>=0.6'
     )
-    # Allow setuptools to handle the scripts
-    scripts = []
 else:
     # If we are running without setuptools, call this function which will
     # check for dependencies an inform the user what is needed.  This is
diff --git a/setupbase.py b/setupbase.py
index 37571a5..835e87a 100644
--- a/setupbase.py
+++ b/setupbase.py
@@ -278,7 +278,7 @@ def find_scripts():
                   file=sys.stderr)
             sys.exit(1)
         scripts.append(pjoin('scripts','ipython_win_post_install.py'))
-    
+
     return scripts
 
 #---------------------------------------------------------------------------