Merge tag 'vm-7.2.0'

[neurodebian.git] / tools / nd-vmsetupwizard

diff --git a/tools/nd-vmsetupwizard b/tools/nd-vmsetupwizard
index 8d69df4b38c3da75afb345ade40b7363371c9428..7afc31367f809af740dd8e5542e2b9802e3ae933 100755 (executable)
--- a/tools/nd-vmsetupwizard
+++ b/tools/nd-vmsetupwizard
@@ -102,12 +102,18 @@ Do you want to get those files, if available, sourced automatically for your env
 fi
 
 # create symlink to shared folder into homedir
-[ ! -e $HOME/host ] && ln -s /media/sf_host $HOME/host
+# note: -e check would exit 1 if link is broken
+#       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,ipython-notebook,ipython-qtconsole
 
 # TODO: add PyMVPA:
 #   FALSE "PyMVPA" "python-mvpa2,python-mvpa2-doc,python-mvpa2-tutorial-data" \
 # needs -doc and -tutorial-data package
-packages=$(zenity --list $icon_opt --checklist --column="Install" --column="Description" \
+packages=$(zenity --height 450 --list $icon_opt --checklist --column="Install" --column="Description" \
           --column="Package Name" --print-column=3 --hide-column=3 --hide-header \
           --separator=' ' --text="Please select any additional component that shall be installed.
 
@@ -115,13 +121,16 @@ Please note that this selection will not affect packages already installed
 on the system. No installed packages will be reinstalled or removed, only
 additional components will be installed." \
 FALSE "Emacs" "emacs" \
-FALSE "GNU Image Manipulation Program (Gimp)" "gimp" \
-FALSE "Octave" "octave,qtoctave" \
+FALSE "Graphics (e.g. GIMP, Inscape)" "gimp,inkscape,svgtune,xzgv,vym" \
+FALSE "Octave" "qtoctave" \
 FALSE "OpenOffice.org" "openoffice.org" \
-FALSE "Scientific Python" "ipython,python-scipy,python-matplotlib" \
+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" "$ipython,spyder,nipy-suite,python-mvpa2" \
+FALSE "Python: Scientific stack" "$ipython,spyder,python-matplotlib,python-pandas,python-sympy,python-statsmodels,python-skimage" \
+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