Adjust scripts for new HOME dir.

diff --git a/tools/nd_adddist b/tools/nd_adddist
index d6b719e27f5b8b749b548eb1d199ca2614f1baec..f31a29b374434930fbd903d2e5b2572e85d4bdf2 100755 (executable)
--- a/tools/nd_adddist
+++ b/tools/nd_adddist
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. /home/cowbuilder/neurodebian.git/tools/nd_cmdsettings.sh
+. /home/neurodebian/neurodebian.git/tools/nd_cmdsettings.sh
 
 # common options
 opts="--distribution $dist --debootstrap debootstrap --aptcache $aptcache"
@@ -8,19 +8,19 @@ opts="--distribution $dist --debootstrap debootstrap --aptcache $aptcache"
 
 for a in i386 amd64; do
   echo "Building $a base path..."
-  if [ -d /home/cowbuilder/cow/${family}-${dist}-${a}.cow ]; then
-    echo "/home/cowbuilder/cow/${family}-${dist}-${a}.cow exists. Ignoring arch."
+  if [ -d ${cowbuilderroot}/cow/${family}-${dist}-${a}.cow ]; then
+    echo "${cowbuilderroot}/cow/${family}-${dist}-${a}.cow exists. Ignoring arch."
     continue
   fi
   if [ "${family:0:3}" = "nd+" ]; then
   echo "Including NeuroDebian repository..."
-    cowbuilder --create --basepath /home/cowbuilder/cow/${family}-${dist}-${a}.cow $opts \
+    cowbuilder --create --basepath ${cowbuilderroot}/cow/${family}-${dist}-${a}.cow $opts \
                --components "$components" \
                --mirror "$mirror" \
                --debootstrapopts --arch --debootstrapopts $a \
                --othermirror "deb http://neuro.debian.net/debian $dist main contrib non-free"
   else
-    cowbuilder --create --basepath /home/cowbuilder/cow/${family}-${dist}-${a}.cow $opts \
+    cowbuilder --create --basepath ${cowbuilderroot}/cow/${family}-${dist}-${a}.cow $opts \
                --components "$components" \
                --mirror "$mirror" \
                --debootstrapopts --arch --debootstrapopts $a

diff --git a/tools/nd_backport b/tools/nd_backport
index 61f09d29bfa109882e7a3c4377360cb6b68496d9..03ef7867635e0d1b8d29f2537390e4057884cd8e 100755 (executable)
--- a/tools/nd_backport
+++ b/tools/nd_backport
@@ -16,7 +16,7 @@ EOT
 exit 1
 fi
 
-. /home/cowbuilder/neurodebian.git/tools/nd_cmdsettings.sh
+. /home/neurodebian/neurodebian.git/tools/nd_cmdsettings.sh
 
 DEBEMAIL="pkg-exppsy-maintainers@lists.alioth.debian.org"
 DEBFULLNAME="NeuroDebian Maintainers"

diff --git a/tools/nd_build b/tools/nd_build
index 549e24df9915600443db667afb16566bb111999d..7fa26c3ad6989c9ca29992b7b4d8e975ba931d3f 100755 (executable)
--- a/tools/nd_build
+++ b/tools/nd_build
@@ -31,7 +31,7 @@ EOT
 exit 1
 fi
 
-. /home/cowbuilder/neurodebian.git/tools/nd_cmdsettings.sh
+. /home/neurodebian/neurodebian.git/tools/nd_cmdsettings.sh
 
 # common options
 opts="--distribution $dist --aptcache $aptcache --buildplace $buildplace"

diff --git a/tools/nd_cmdsettings.sh b/tools/nd_cmdsettings.sh
index d34ade1b4f9e93b5e1df9dc4d6573c69a97333cd..6a5103a9cf4b45c8925541d59668239d50c6a89c 100755 (executable)
--- a/tools/nd_cmdsettings.sh
+++ b/tools/nd_cmdsettings.sh
@@ -14,9 +14,13 @@ if [ -z "$dist" ]; then
 fi
 
 # basic settings
-cowbuilderroot="/home/cowbuilder"
+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"
+
 # default is debian
 aptcache="${cowbuilderroot}/debian_aptcache"
 components="main contrib non-free"

diff --git a/tools/nd_gitbuild b/tools/nd_gitbuild
index a80af0774d6c9e8e7fd2e46942f932c30f22dcf7..4fae395688fbe224ef86688a4c10ac4aefb5eac0 100755 (executable)
--- a/tools/nd_gitbuild
+++ b/tools/nd_gitbuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. /home/cowbuilder/neurodebian.git/tools/nd_cmdsettings.sh
+. /home/neurodebian/neurodebian.git/tools/nd_cmdsettings.sh
 
 # common options
 opts="--distribution $dist --aptcache $aptcache --buildplace $buildplace"

diff --git a/tools/nd_updatedist b/tools/nd_updatedist
index 81f511fe8ec203c120be222b3e435cbb2a856b31..432f9bc47eb08e5ab49066f5175db7964ca014f7 100755 (executable)
--- a/tools/nd_updatedist
+++ b/tools/nd_updatedist
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. /home/cowbuilder/neurodebian.git/tools/nd_cmdsettings.sh
+. /home/neurodebian/neurodebian.git/tools/nd_cmdsettings.sh
 
 # common options
 opts="--distribution $dist --aptcache $aptcache --buildplace $buildplace"
@@ -13,5 +13,5 @@ fi
 
 for a in $arch; do
   echo "Updating arch $a..."
-  cowbuilder --update --basepath /home/cowbuilder/cow/${family}-${dist}-${a}.cow $opts
+  cowbuilder --update --basepath ${cowbuilderroot}/cow/${family}-${dist}-${a}.cow $opts
 done