Move nd_cmdsettings.sh, but also deprecate it

All config should use nd_query now.

diff --git a/cmdsettings.sh b/cmdsettings.sh
new file mode 100755 (executable)
index 0000000..90b78ad
--- /dev/null
+++ b/cmdsettings.sh
@@ -0,0 +1,24 @@
+family=$1
+dist=$2
+
+# basic settings
+cowbuilderroot="/home/neurodebian"
+buildplace="${cowbuilderroot}/build"
+
+# all cuurently supported dists
+alldists="nd+debian-lenny nd+debian-squeeze nd+debian-sid \
+          nd+ubuntu-maverick nd+ubuntu-lucid nd+ubuntu-karmic nd+ubuntu-jaunty"
+
+# default is debian
+aptcache="${cowbuilderroot}/debian_aptcache"
+components="main contrib non-free"
+mirror="http://debian.lcs.mit.edu/debian"
+
+# overwrite necessary bits for ubuntu
+if [ "${family#nd+}" = "ubuntu" ]; then
+  aptcache="${cowbuilderroot}/ubuntu_aptcache"
+  components="main universe"
+  mirror="http://ubuntu.media.mit.edu/ubuntu"
+fi
+
+if [ ! -d $aptcache ]; then mkdir $aptcache; fi

diff --git a/debian/neurodebian-dev.install b/debian/neurodebian-dev.install
index bf8987cad0b61cf90849af3f8d61104848c51356..3f0acec79d1db78828768a6f1f604b9767da1d64 100644 (file)
--- a/debian/neurodebian-dev.install
+++ b/debian/neurodebian-dev.install
@@ -2,5 +2,6 @@ tools/backport-dsc usr/bin/
 tools/nd_querycfg usr/bin/
 tools/nd_backport usr/bin/
 neurodebian.cfg /etc/neurodebian/
+cmdsettings.sh /etc/neurodebian/
 pkgs usr/share/neurodebian/
 sphinx usr/share/neurodebian/

diff --git a/tools/nd_cmdsettings.sh b/tools/nd_cmdsettings.sh
deleted file mode 100755 (executable)
index 90b78ad..0000000
--- a/tools/nd_cmdsettings.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-family=$1
-dist=$2
-
-# basic settings
-cowbuilderroot="/home/neurodebian"
-buildplace="${cowbuilderroot}/build"
-
-# all cuurently supported dists
-alldists="nd+debian-lenny nd+debian-squeeze nd+debian-sid \
-          nd+ubuntu-maverick nd+ubuntu-lucid nd+ubuntu-karmic nd+ubuntu-jaunty"
-
-# default is debian
-aptcache="${cowbuilderroot}/debian_aptcache"
-components="main contrib non-free"
-mirror="http://debian.lcs.mit.edu/debian"
-
-# overwrite necessary bits for ubuntu
-if [ "${family#nd+}" = "ubuntu" ]; then
-  aptcache="${cowbuilderroot}/ubuntu_aptcache"
-  components="main universe"
-  mirror="http://ubuntu.media.mit.edu/ubuntu"
-fi
-
-if [ ! -d $aptcache ]; then mkdir $aptcache; fi