X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=tools%2Fnd-vmsetupwizard;h=43a58809fe4f174d36b5b5c4a40d9f74b64fa576;hb=HEAD;hp=2882af860bf2c75e4b84399992b004d0f8dc3646;hpb=73ad1fff3e6549776cd41142a33b325f5c602d84;p=neurodebian.git

diff --git a/tools/nd-vmsetupwizard b/tools/nd-vmsetupwizard
index 2882af8..43a5880 100755
--- a/tools/nd-vmsetupwizard
+++ b/tools/nd-vmsetupwizard
@@ -32,11 +32,21 @@ Do you want to proceed with updating the system?
 fi
 
 # initialize apt
-update-manager -c
-
-sudo update-software-center --debug 2>&1 | \
-	zenity $icon_opt --title="Updating Software Center Repository"  \
-		--progress  --pulsate --auto-close --auto-kill 
+#
+# update-manager (from update-manager-gnome) and
+# update-software-center (from software-center)
+# are present only in wheezy
+if which update-manager > /dev/null; then update-manager -c; fi
+
+if which update-software-center > /dev/null; then
+    sudo update-software-center --debug 2>&1 | \
+	    zenity $icon_opt --title="Updating Software Center Repository"  \
+		   --progress  --pulsate --auto-close --auto-kill;
+else
+    sudo apt-get update 2>&1 | \
+	    zenity $icon_opt --title="Running apt-get update" \
+		   --progress  --pulsate --auto-close --auto-kill;
+fi
 
 popconf=/etc/popularity-contest.conf
 if [ ! -e "$popconf" ] || grep -q -e '^PARTICIPATE.*no' "$popconf" ;
@@ -49,7 +59,7 @@ then
 
 	if [ -e "$popconf" ] ; then
 	# just reconfigure so user could get a chance to participate
-		sudo DEBIAN_FRONTEND=gnome dpkg-reconfigure popularity-contest	
+		sudo DEBIAN_FRONTEND=gnome dpkg-reconfigure popularity-contest
 	else
 	# install, but do not fail if something goes wrong
 		nd-autoinstall popularity-contest /etc/popularity-contest.conf || true
@@ -94,7 +104,7 @@ if ! grep -q '/etc/fsl/fsl.sh' $HOME/.profile && \
 
 Do you want to get those files, if available, sourced automatically for your environment?
 "; then
-   for t in fsl afni; do
+   for t in fsl afni cmtk freesurfer; do
 	cf="/etc/$t/$t.sh"
 	grep -q -e "$cf" $HOME/.profile || \
 		echo "[ -e \"$cf\" ] && . $cf" >> $HOME/.profile
@@ -102,9 +112,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 /mnt/host $HOME/host
-
-packages=$(zenity --list $icon_opt --checklist --column="Install" --column="Description" \
+# 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 --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.
 
@@ -112,13 +131,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