Merge remote-tracking branch 'alioth/devel'

[neurodebian.git] / tools / nd-configurerepo

diff --git a/tools/nd-configurerepo b/tools/nd-configurerepo
index 0b0f91caaa741c4ad857e383d85546dd48007099..e3a7d47a0718bc08e8d93b639b09435f7c22b8d0 100755 (executable)
--- a/tools/nd-configurerepo
+++ b/tools/nd-configurerepo
@@ -15,25 +15,25 @@ set -u
 
 nd_aptenable_version=0.1
 
-nd_key_id=0x2649A5A9
+nd_key_id=0xA5D32F012649A5A9
 nd_config_url=https://raw.githubusercontent.com/neurodebian/neurodebian/master/neurodebian.cfg
 nd_config_file=/etc/neurodebian/neurodebian.cfg
 nd_mirror_origin=http://neuro.debian.net/debian
 nd_mirror_default=$nd_mirror_origin # or may be AWS?
 
-# To be set by cmdline args or via env variables with prefix ND_AE_
-ae_release=${ND_AE_RELEASE:-}
-ae_components=${ND_AE_COMPONENTS:-software,data}
-ae_flavor=${ND_AE_FLAVOR:-}
-ae_mirror=${ND_AE_MIRROR:-best}
-ae_suffix=${ND_AE_SUFFIX:-}
-ae_verbose=${ND_AE_VERBOSE:-1}
-ae_overwrite=${ND_AE_OVERWRITE:-}
-ae_sources=${ND_AE_SOURCES:-}
-ae_install=${ND_AE_INSTALL:-}
-ae_update=${ND_AE_UPDATE:-1}
-ae_dry_run=${ND_AE_DRY_RUN:-}
-ae_defun_only=${ND_AE_DEFUN_ONLY:-} # mode to source this file as a "library"
+# To be set by cmdline args or via env variables with prefix NEURODEBIAN_
+ae_release=${NEURODEBIAN_RELEASE:-}
+ae_components=${NEURODEBIAN_COMPONENTS:-software,data}
+ae_flavor=${NEURODEBIAN_FLAVOR:-}
+ae_mirror=${NEURODEBIAN_MIRROR:-best}
+ae_suffix=${NEURODEBIAN_SUFFIX:-}
+ae_verbose=${NEURODEBIAN_VERBOSE:-1}
+ae_overwrite=${NEURODEBIAN_OVERWRITE:-}
+ae_sources=${NEURODEBIAN_SOURCES:-}
+ae_install=${NEURODEBIAN_INSTALL:-}
+ae_update=${NEURODEBIAN_UPDATE:-1}
+ae_dry_run=${NEURODEBIAN_DRY_RUN:-}
+ae_defun_only=${NEURODEBIAN_DEFUN_ONLY:-} # mode to source this file as a "library"
 
 ae_sudo=
 exe_dir=$(dirname $0)
@@ -44,12 +44,12 @@ do_print_flavor=
 # - apt priority! (so we could avoid automagic upgrades etc)
 # - multiarch setups
 
-if [ -z "${ND_AE_TEMPDIR:-}" ]; then
+if [ -z "${NEURODEBIAN_TEMPDIR:-}" ]; then
     ae_tempdir=$(mktemp -d)
     trap "rm -rf \"$ae_tempdir\"" TERM INT EXIT
 else
     # reuse the same directory/fetched configuration if was specified
-    ae_tempdir="${ND_AE_TEMPDIR:-}"
+    ae_tempdir="${NEURODEBIAN_TEMPDIR:-}"
 fi
 
 
@@ -152,7 +152,7 @@ Options:
     Return a list (with abbreviation) of known NeuroDebian mirrors.
 
   --overwrite,
-    If apt file already present, it would not be overriden (by default).
+    If apt file already present, it would not be overridden (by default).
     Use this option to overwrite.
 
   --suffix=SUFFIX
@@ -544,7 +544,7 @@ fi
 #
 
 # Figure out if key needs to be imported (if ran within package,
-# should already be there due to neurodebian-keyring package)
+# should already be there due to neurodebian-archive-keyring package)
 if LANG=C eval $ae_sudo apt-key export $nd_key_id 2>&1 1>/dev/null | grep -qe "nothing exported"; then
     print_verbose 1 "Fetching the key from the server"
     eval_dry apt-key adv --recv-keys --keyserver pgp.mit.edu $nd_key_id