From 33ee16058fc1aad1ee544b645445f75cee839b54 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Tue, 26 Jun 2018 12:09:24 +0200
Subject: [PATCH] apt_get_auto_install function to install packages then mark
 as auto

---
 gitlab-ci-aptly   |  5 +----
 gitlab-ci-common  | 13 +++++++++++++
 gitlab-ci-lintian |  5 +----
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/gitlab-ci-aptly b/gitlab-ci-aptly
index 5f8a6a3..b9c6a7e 100755
--- a/gitlab-ci-aptly
+++ b/gitlab-ci-aptly
@@ -22,10 +22,7 @@ JOB_URL="$CI_PROJECT_URL/-/jobs/$CI_JOB_ID"
 COMMIT_URL="$CI_PROJECT_URL/commit/$CI_COMMIT_SHA"
 BRANCH_URL="$CI_PROJECT_URL/commits/$CI_COMMIT_REF_NAME"
 
-depends="aptly gnupg1"
-$apt_get update
-$apt_get install --no-install-recommends $depends
-apt-mark auto $depends
+apt_get_auto_install aptly gnupg1
 
 # build apt repo from freshly built .debs
 aptly="aptly -gpg-provider=internal"
diff --git a/gitlab-ci-common b/gitlab-ci-common
index b778f71..0f02aac 100644
--- a/gitlab-ci-common
+++ b/gitlab-ci-common
@@ -5,3 +5,16 @@ if [ -z "$CI" ]; then
 fi
 
 apt_get="apt-get -qy $APT_GET_OPTIONS"
+
+function apt_get_auto_install() {
+    $apt_get update
+    $apt_get install $@ && apt-mark auto $@
+}
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 4
+# sh-indent-comment: t
+# indent-tabs-mode: nil
+# End:
+# ex: ts=4 sw=4 et filetype=bash
diff --git a/gitlab-ci-lintian b/gitlab-ci-lintian
index b6c3fb2..7569b30 100755
--- a/gitlab-ci-lintian
+++ b/gitlab-ci-lintian
@@ -2,10 +2,7 @@
 
 . /usr/share/gitlab-ci-common
 
-depends="lintian"
-$apt_get update
-$apt_get install $depends
-apt-mark auto $depends
+apt_get_auto_install lintian
 
 echo "performing general and experimental lintian checks"
 su --shell /bin/sh nobody --command "lintian --color always -EviIL +pedantic ../*.changes" || true