ctdb-scripts: Do not de-duplicate the interfaces list

[samba.git] / packaging / bin / fill-templates

diff --git a/packaging/bin/fill-templates b/packaging/bin/fill-templates
index 537664dd117116292f5cb1a84f5e175cf41d86a1..cd711bd3294b14e134813be434141e64fafcb95b 100755 (executable)
--- a/packaging/bin/fill-templates
+++ b/packaging/bin/fill-templates
@@ -4,7 +4,7 @@
 # information that is created by mkversion in advance.
 #
 # This is a standalone wrapper for update-pkginfo, which
-# is ususally called from release-scripts/create-tarball.
+# is usually called from release-scripts/create-tarball.
 # This allows for testing some aspects of packaging without
 # the need to go through all of create-tarball.
 #
@@ -17,31 +17,31 @@ TOPDIR=${DIRNAME}/../..
 SRCDIR=${TOPDIR}/source3
 VERSION_H=${SRCDIR}/include/version.h
 
-pushd ${SRCDIR} > /dev/null 2>&1
+pushd ${SRCDIR} >/dev/null 2>&1
 ./script/mkversion.sh
-popd > /dev/null 2>&1
+popd >/dev/null 2>&1
 
-if [ ! -f ${VERSION_H} ] ; then
+if [ ! -f ${VERSION_H} ]; then
        echo "Error creating version.h"
        exit 1
 fi
 
-VERSION=`grep SAMBA_VERSION_OFFICIAL_STRING ${VERSION_H} | awk '{print $3}'`
+VERSION=$(grep "define SAMBA_VERSION_OFFICIAL_STRING" ${VERSION_H} | awk '{print $3}')
 
-vendor_version=`grep SAMBA_VERSION_VENDOR_SUFFIX ${VERSION_H} | awk '{print $3}'`
-if test "x${vendor_version}" != "x" ; then
+vendor_version=$(grep "define SAMBA_VERSION_VENDOR_SUFFIX" ${VERSION_H} | awk '{print $3}')
+if test "x${vendor_version}" != "x"; then
        VERSION="${VERSION}-${vendor_version}"
 fi
 
-vendor_patch=`grep SAMBA_VERSION_VENDOR_PATCH ${VERSION_H} | awk '{print $3}'`
-if test "x${vendor_patch}" != "x" ; then
+vendor_patch=$(grep "define SAMBA_VERSION_VENDOR_PATCH" ${VERSION_H} | awk '{print $3}')
+if test "x${vendor_patch}" != "x"; then
        VERSION="${VERSION}-${vendor_patch}"
 fi
 
-VERSION=`echo ${VERSION} | sed 's/\"//g'`
+VERSION=$(echo ${VERSION} | sed 's/\"//g')
 
 echo "VERSION: ${VERSION}"
 
-pushd ${TOPDIR}/packaging > /dev/null 2>&1
+pushd ${TOPDIR}/packaging >/dev/null 2>&1
 ./bin/update-pkginfo "${VERSION}" 1 ""
-popd > /dev/null 2>&1
+popd >/dev/null 2>&1