Adapt all tools to the new config location and install them.

diff --git a/cmdsettings.sh b/cmdsettings.sh
old mode 100755 (executable)
new mode 100644 (file)

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

diff --git a/tools/nd_adddist b/tools/nd_adddist
index 0d9ab920d495652de5cdb6f2ddd6ff48022cd49d..065173d98c6e115752d4539d2750baa9e75b3b41 100755 (executable)
--- a/tools/nd_adddist
+++ b/tools/nd_adddist
@@ -16,7 +16,7 @@ if [ -z "$dist" ]; then
 fi
 
 
-. /home/neurodebian/neurodebian.git/tools/nd_cmdsettings.sh
+. /etc/neurodebian/cmdsettings.sh
 
 # common options
 opts="--distribution $dist --debootstrap debootstrap --aptcache $aptcache"

diff --git a/tools/nd_build b/tools/nd_build
index 58e5f1dddd7c41c0881fa05d31a62ed372848b19..0d588391be3c4f47928074a4a694862d1901777e 100755 (executable)
--- a/tools/nd_build
+++ b/tools/nd_build
@@ -46,7 +46,7 @@ if [ -z "$dist" ]; then
   exit 1
 fi
 
-. /home/neurodebian/neurodebian.git/tools/nd_cmdsettings.sh
+. /etc/neurodebian/cmdsettings.sh
 
 # common options
 opts="--distribution $dist --aptcache $aptcache --buildplace $buildplace"

diff --git a/tools/nd_build4allnd b/tools/nd_build4allnd
index 7edfe35b8d67f6553479f20407498db388630305..ea4284a60d3a2d06c03410e62ab7dbc28b674395 100755 (executable)
--- a/tools/nd_build4allnd
+++ b/tools/nd_build4allnd
@@ -15,7 +15,7 @@ fi
 
 
 
-. /home/neurodebian/neurodebian.git/tools/nd_cmdsettings.sh
+. /etc/neurodebian/cmdsettings.sh
 
 for d in $alldists; do
   dfamily=${d%%-*}

diff --git a/tools/nd_gitbuild b/tools/nd_gitbuild
index ddec36d7b7d790aeafb43ea169c8b2a0d11930d5..3473904f40d3298be4d73ef05dd991aab18872cc 100755 (executable)
--- a/tools/nd_gitbuild
+++ b/tools/nd_gitbuild
@@ -15,7 +15,7 @@ if [ -z "$dist" ]; then
   exit 1
 fi
 
-. /home/neurodebian/neurodebian.git/tools/nd_cmdsettings.sh
+. /etc/neurodebian/cmdsettings.sh
 
 # common options
 opts="--distribution $dist --aptcache $aptcache --buildplace $buildplace"

diff --git a/tools/nd_login b/tools/nd_login
index fa5612389c160f0cd095cb515504c534fd1060e5..2237e5c6dbee7e7ececd2e8196bb3fe58e29d8d9 100755 (executable)
--- a/tools/nd_login
+++ b/tools/nd_login
@@ -35,7 +35,7 @@ if [ -z "$arch" ]; then
   exit 1
 fi
 
-. /home/neurodebian/neurodebian.git/tools/nd_cmdsettings.sh
+. /etc/neurodebian/cmdsettings.sh
 
 # common options
 opts="--distribution $dist --aptcache $aptcache --buildplace $buildplace"

diff --git a/tools/nd_updateall b/tools/nd_updateall
index b2e3edbef2ded8698435710a04eea4a86bddbf0c..aaf30c5f1ffbfd58cc420edbe8537f87657dc24e 100755 (executable)
--- a/tools/nd_updateall
+++ b/tools/nd_updateall
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. /home/neurodebian/neurodebian.git/tools/nd_cmdsettings.sh
+. /etc/neurodebian/cmdsettings.sh
 
 for d in $alldists; do
   dfamily=${d%%-*}

diff --git a/tools/nd_updatedist b/tools/nd_updatedist
index e4cc9aa4b26c6e8de10ab0fc7f526a533666cb94..8a92ac8601858cbdf271811dd840e8784431425b 100755 (executable)
--- a/tools/nd_updatedist
+++ b/tools/nd_updatedist
@@ -15,7 +15,7 @@ if [ -z "$dist" ]; then
   exit 1
 fi
 
-. /home/neurodebian/neurodebian.git/tools/nd_cmdsettings.sh
+. /etc/neurodebian/cmdsettings.sh
 
 # common options
 opts="--distribution $dist --aptcache $aptcache --buildplace $buildplace"