Move args checks into each script.

diff --git a/tools/nd_adddist b/tools/nd_adddist
index f31a29b374434930fbd903d2e5b2572e85d4bdf2..0d9ab920d495652de5cdb6f2ddd6ff48022cd49d 100755 (executable)
--- a/tools/nd_adddist
+++ b/tools/nd_adddist
@@ -1,5 +1,21 @@
 #!/bin/bash
 
+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
+
+
 . /home/neurodebian/neurodebian.git/tools/nd_cmdsettings.sh
 
 # common options

diff --git a/tools/nd_backport b/tools/nd_backport
index 03ef7867635e0d1b8d29f2537390e4057884cd8e..039b1f42169f5ab3ab64f1c91c30af981d2815fe 100755 (executable)
--- a/tools/nd_backport
+++ b/tools/nd_backport
@@ -1,5 +1,21 @@
 #!/bin/bash
 
+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
+
+
 set -e
 set -u
 

diff --git a/tools/nd_build b/tools/nd_build
index 7fa26c3ad6989c9ca29992b7b4d8e975ba931d3f..08ac6e2fcee0f1ca2cf8917394ae13aaba84c320 100755 (executable)
--- a/tools/nd_build
+++ b/tools/nd_build
@@ -31,6 +31,21 @@ EOT
 exit 1
 fi
 
+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
+
 . /home/neurodebian/neurodebian.git/tools/nd_cmdsettings.sh
 
 # common options

diff --git a/tools/nd_cmdsettings.sh b/tools/nd_cmdsettings.sh
index 92871d433b38e8094c1e6eb435e547d8aacbd6ba..34239333197fa1c661dbd2bfe6790071f503102e 100755 (executable)
--- a/tools/nd_cmdsettings.sh
+++ b/tools/nd_cmdsettings.sh
@@ -3,16 +3,6 @@ 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"

diff --git a/tools/nd_gitbuild b/tools/nd_gitbuild
index 4fae395688fbe224ef86688a4c10ac4aefb5eac0..ddec36d7b7d790aeafb43ea169c8b2a0d11930d5 100755 (executable)
--- a/tools/nd_gitbuild
+++ b/tools/nd_gitbuild
@@ -1,5 +1,20 @@
 #!/bin/bash
 
+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
+
 . /home/neurodebian/neurodebian.git/tools/nd_cmdsettings.sh
 
 # common options

diff --git a/tools/nd_updatedist b/tools/nd_updatedist
index 432f9bc47eb08e5ab49066f5175db7964ca014f7..e4cc9aa4b26c6e8de10ab0fc7f526a533666cb94 100755 (executable)
--- a/tools/nd_updatedist
+++ b/tools/nd_updatedist
@@ -1,5 +1,20 @@
 #!/bin/bash
 
+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
+
 . /home/neurodebian/neurodebian.git/tools/nd_cmdsettings.sh
 
 # common options