Commit f7a5ba84 authored by Andrew Gibiansky's avatar Andrew Gibiansky

use bash and now run ipython in the venv

parent 8334a607
......@@ -46,6 +46,7 @@ data-files:
installation/ipython.sh
installation/update.sh
installation/virtualenv.sh
installation/run.sh
profile/profile.tar
library
......
#!/bin/sh
#!/bin/bash
# Which virtualenv to use.
VIRTUALENV=$1
......
#!/bin/bash
# Which virtualenv to use.
VIRTUALENV=$1
shift
# Activate the virtualenv.
source $VIRTUALENV/bin/activate
# Run IPython.
ipython $@
#!/bin/sh
#!/bin/bash
# Which virtualenv to use.
VIRTUALENV=$1
......
#!/bin/sh
#!/bin/bash
# Which version of virtualenv to use.
VIRTUALENV=virtualenv-1.9
......@@ -7,9 +7,11 @@ VIRTUALENV=virtualenv-1.9
DESTINATION=$1
# Download virtualenv.
echo "Downloading virtualenv."
curl -O https://pypi.python.org/packages/source/v/virtualenv/$VIRTUALENV.tar.gz
tar xvfz $VIRTUALENV.tar.gz
cd $VIRTUALENV
# Create a virtualenv.
echo "Creating a virtualenv."
python virtualenv.py $DESTINATION
......@@ -52,8 +52,12 @@ ipython :: WhichIPython -- ^ Which IPython to use (user-provided or IHaskell-ins
-> [Text] -- ^ IPython command line arguments.
-> Sh String -- ^ IPython output.
ipython which suppress args = do
ipythonPath <- ipythonExePath which
runHandles ipythonPath args handles doNothing
runCmd <- liftIO $ Paths.getDataFileName "installation/run.sh"
venv <- fpToText <$> ipythonDir
print venv
print runCmd
let cmdArgs = [pack runCmd, venv] ++ args
runHandles "bash" cmdArgs handles doNothing
where handles = [InHandle Inherit, outHandle suppress, errorHandle suppress]
outHandle True = OutHandle CreatePipe
outHandle False = OutHandle Inherit
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment