Most famous revert -- sombody should do this right.

[neurodebian.git] / tools / nd_cmdsettings.sh

diff --git a/tools/nd_cmdsettings.sh b/tools/nd_cmdsettings.sh
index 6a5103a9cf4b45c8925541d59668239d50c6a89c..9fcd75edf25f6f9d88ad30bf825e9bc6ec511fa3 100755 (executable)
--- a/tools/nd_cmdsettings.sh
+++ b/tools/nd_cmdsettings.sh
@@ -1,25 +1,13 @@
 family=$1
 dist=$2
 
-set -e
-
-if [ -z "$family" ]; then
-  echo "You need to provide a distribution family ('debian', 'ubuntu'); prefix with 'nd+' to enable the NeuroDebian repository."
-  exit 1
-fi
-
-if [ -z "$dist" ]; then
-  echo "You need to provide a distribution codename (e.g. 'lenny', 'squeeze')."
-  exit 1
-fi
-
 # basic settings
 cowbuilderroot="/home/neurodebian"
 buildplace="${cowbuilderroot}/build"
 
 # all cuurently supported dists
-alldists="nd+debian-sid nd+debian-squeeze nd+debian-lenny \
-          nd+ubuntu-hardy nd+ubuntu-intrepid nd+ubuntu-jaunty"
+alldists="nd+debian-lenny nd+debian-squeeze nd+debian-sid \
+          nd+ubuntu-lucid nd+ubuntu-karmic nd+ubuntu-jaunty"
 
 # default is debian
 aptcache="${cowbuilderroot}/debian_aptcache"
@@ -27,7 +15,7 @@ components="main contrib non-free"
 mirror="http://debian.lcs.mit.edu/debian"
 
 # overwrite necessary bits for ubuntu
-if [ "$family" = "ubuntu" ]; then
+if [ "${family#nd+}" = "ubuntu" ]; then
   aptcache="${cowbuilderroot}/ubuntu_aptcache"
   components="main universe"
   mirror="http://ubuntu.media.mit.edu/ubuntu"