Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Already on GitHub? Sign in to your account

Windows workdir #198

Merged
2 commits merged into from Nov 3, 2010
Jump to file or symbol
Failed to load files and symbols.
+10 −8
Split
@@ -51,26 +51,30 @@ 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')
cmd = '"%s"' % ipybase
- mkshortcut(python,'IPython',link,cmd)
+ mkshortcut(python, 'IPython', link, cmd, workdir)
link = pjoin(ip_start_menu, 'pysh.lnk')
cmd = '"%s" -p sh' % ipybase
- mkshortcut(python,'IPython (command prompt mode)',link,cmd)
+ mkshortcut(python, 'IPython (command prompt mode)', link, cmd, workdir)
link = pjoin(ip_start_menu, 'scipy.lnk')
cmd = '"%s" -p scipy' % ipybase
- mkshortcut(python,'IPython (scipy profile)',link,cmd)
+ mkshortcut(python, 'IPython (scipy profile)', link, cmd, workdir)
link = pjoin(ip_start_menu, 'ipcontroller.lnk')
cmd = '"%s" -xy' % pjoin(scripts, 'ipcontroller')
- mkshortcut(python,'IPython controller',link,cmd)
+ mkshortcut(python, 'IPython controller', link, cmd, workdir)
link = pjoin(ip_start_menu, 'ipengine.lnk')
cmd = '"%s"' % pjoin(scripts, 'ipengine')
- mkshortcut(python,'IPython engine',link,cmd)
+ mkshortcut(python, 'IPython engine', link, cmd, workdir)
# Create documentation shortcuts ...
t = prefix + r'\share\doc\ipython\manual\ipython.pdf'
View
@@ -232,8 +232,6 @@ def cleanup():
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
View
@@ -278,7 +278,7 @@ def find_scripts():
file=sys.stderr)
sys.exit(1)
scripts.append(pjoin('scripts','ipython_win_post_install.py'))
-
+
return scripts
#---------------------------------------------------------------------------