Adjust Recommends for REPOSITORY_EXTRA feature + minor style improvements

debian/control

@@ -15,7 +15,9 @@ Depends: fakeroot,
          reprepro | freight,
          sudo | sudo-ldap,
          ${misc:Depends}
-Recommends: jenkins-debian-glue-buildenv-git
+Recommends: curl,
+            gnupg,
+            jenkins-debian-glue-buildenv-git
 Description: glue scripts for building Debian packages inside Jenkins
  This package provides scripts which should make building Debian
  package inside Jenkins (a Continuous Integration suite) easier.

examples/debian_glue

@@ -64,14 +64,14 @@
 # If unset the build environment won't be kept if building fails.
 # DEB_KEEP_BUILD_ENV=true
 
-# List of string with extra repos for resolving dependencies. Comma
-# is delimiter. For example:
+# Comma separated list of extra repositories for resolving dependencies.
+# Usage example:
 # REPOSITORY_EXTRA='deb http://security.debian.org/ wheezy/updates main,deb-src http://security.debian.org/ wheezy/updates main'
 # Default:
 # REPOSITORY_EXTRA=
 
-# List of urls with keys for extra repos. Comma is delimiter.
-# For example:
+# Comma separated list of URLs with keys for extra repositories.
+# Usage example:
 # REPOSITORY_EXTRA_KEYS='http://foorepo.domain.com/key1.gpg,http://barrepo.domain.com/key2.gpg'
 # Default:
 # REPOSITORY_EXTRA_KEYS=

scripts/build-and-provide-package

@@ -376,21 +376,20 @@ EOF
     fi
   fi
 
-  # Adding extra perository for resolving dependencies
+  # Adding extra repository for resolving dependencies
   if [ -n "${REPOSITORY_EXTRA:-}" ]; then
     echo ${REPOSITORY_EXTRA} | tr ',' '\n' > /tmp/apt-$$/extra.list
   fi
-  
+
   if [ -n "${REPOSITORY_EXTRA_KEYS:-}" ]; then
-    OIFS=$IFS
+    OIFS="$IFS"
     IFS=',' read -a array <<< "${REPOSITORY_EXTRA_KEYS}"
-    for key in "${array[@]}"
-    do
+    for key in "${array[@]}" ; do
       curl -O "${key}"
       gpg --no-default-keyring --keyring /tmp/apt-$$/keyring.gpg --import "${key##*/}"
     done
     unset key
-    IFS=$OIFS
+    IFS="$OIFS"
   fi
 
   local pbuilderrc=$(mktemp)