X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=tools%2Fnd-vmsetupwizard;h=43a58809fe4f174d36b5b5c4a40d9f74b64fa576;hb=HEAD;hp=1ab3e4b0dddb7daa4b674d7c63124c1923f55c51;hpb=738f6514ae118d35065bf271e81cc47f0e5102ab;p=neurodebian.git

diff --git a/tools/nd-vmsetupwizard b/tools/nd-vmsetupwizard
index 1ab3e4b..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" ;
@@ -108,7 +118,7 @@ fi
 
 # 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
+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" \
@@ -127,7 +137,7 @@ FALSE "OpenOffice.org" "openoffice.org" \
 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" \
+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" \