From afc2579d1a5aa3b95d90d6a1fdf7d6a4e3058fd6 Mon Sep 17 00:00:00 2001 From: Kenfe-Mickael Laventure Date: Thu, 2 Jun 2016 07:38:32 -0700 Subject: [PATCH] Fix release-deb script Signed-off-by: Kenfe-Mickael Laventure --- hack/make/release-deb | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/hack/make/release-deb b/hack/make/release-deb index c6a677a5b..f1edf7723 100755 --- a/hack/make/release-deb +++ b/hack/make/release-deb @@ -29,7 +29,8 @@ arches=( amd64 i386 ) # Preserve existing components but don't add any non-existing ones for component in main testing experimental ; do - if ls "$APTDIR/dists/*/$component" >/dev/null 2>&1 ; then + exists=$(find "$APTDIR/dists" -mindepth 2 -maxdepth 2 -type d -name "$component" -print -quit) + if [ -n "$exists" ] ; then components+=( $component ) fi done @@ -89,14 +90,12 @@ for dir in contrib/builder/deb/${PACKAGE_ARCH}/*/; do EOF done >> "$APTDIR/conf/apt-ftparchive.conf" -if [ ! -f "$APTDIR/conf/docker-engine-release.conf" ]; then - cat <<-EOF > "$APTDIR/conf/docker-engine-release.conf" - APT::FTPArchive::Release::Origin "Docker"; - APT::FTPArchive::Release::Components "${components[*]}"; - APT::FTPArchive::Release::Label "Docker APT Repository"; - APT::FTPArchive::Release::Architectures "${arches[*]}"; - EOF -fi +cat <<-EOF > "$APTDIR/conf/docker-engine-release.conf" +APT::FTPArchive::Release::Origin "Docker"; +APT::FTPArchive::Release::Components "${component}"; +APT::FTPArchive::Release::Label "Docker APT Repository"; +APT::FTPArchive::Release::Architectures "${arches[*]}"; +EOF # release the debs for dir in contrib/builder/deb/${PACKAGE_ARCH}/*/; do