X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=tools%2Fnd-vmsetupwizard;h=1ab3e4b0dddb7daa4b674d7c63124c1923f55c51;hb=30c2340a3704ea2e499723e15b75435825be52e6;hp=496ccf173ef74afb1577c9668b132dfc56819442;hpb=50ce9c2131d4282247929546bd020426364dd599;p=neurodebian.git

diff --git a/tools/nd-vmsetupwizard b/tools/nd-vmsetupwizard
index 496ccf1..1ab3e4b 100755
--- a/tools/nd-vmsetupwizard
+++ b/tools/nd-vmsetupwizard
@@ -106,6 +106,10 @@ fi
 #       ln -f is used for further robustness
 [ ! -L $HOME/host ] && ln -sf /media/sf_host $HOME/host
 
+# Figure out which version of IPython is available
+ipython_version=$(apt-cache policy ipython 2>/dev/null | sed -ne '/Version table:/ { n;s,^[ \*]*\(.*\) .*,\1,gp}')
+dpkg --compare-versions $ipython_version lt 0.13.1 && ipython=ipython01x || ipython=ipython
+
 # TODO: add PyMVPA:
 #   FALSE "PyMVPA" "python-mvpa2,python-mvpa2-doc,python-mvpa2-tutorial-data" \
 # needs -doc and -tutorial-data package
@@ -118,16 +122,15 @@ on the system. No installed packages will be reinstalled or removed, only
 additional components will be installed." \
 FALSE "Emacs" "emacs" \
 FALSE "Graphics (e.g. GIMP, Inscape)" "gimp,inkscape,svgtune,xzgv,vym" \
-FALSE "Octave" "octave,qtoctave" \
+FALSE "Octave" "qtoctave" \
 FALSE "OpenOffice.org" "openoffice.org" \
-FALSE "PyMVPA Tutorial" "ipython01x,python-mvpa2,python-mvpa2-doc,python-mvpa2-tutorialdata,spyder" \
+FALSE "PyMVPA Tutorial" "$ipython,python-mvpa2,python-mvpa2-doc,python-mvpa2-tutorialdata,spyder" \
 FALSE "Python: Electrophysiology & Modeling" "python-brian,python-pynn,python-pyentropy,stimfit" \
-FALSE "Python: Neuroimaging" "ipython01x,spyder,nipy-suite,python-mvpa2" \
-FALSE "Python: Scientific stack" "ipython01x,spyder,python-matplotlib,python-pandas,python-sympy" \
+FALSE "Python: Neuroimaging" "$ipython,spyder,nipy-suite,python-mvpa2" \
+FALSE "Python: Scientific stack" "$ipython,spyder,python-matplotlib,python-pandas,python-sympy" \
 FALSE "R" "r-recommended" \
 FALSE "TeX Live" "texlive" \
 FALSE "Adobe Flash browser plugin" "flashplugin-nonfree" \
-FALSE "Sun Java browser plugin" "sun-java6-plugin" \
 || true)
 
 if [ -n "$packages" ]; then