From 10884268118484ddff2d0d3fe30c9fbe481ad120 Mon Sep 17 00:00:00 2001
From: Alexandre Pujol <alexandre@pujol.io>
Date: Wed, 29 Mar 2023 00:19:44 +0100
Subject: [PATCH] chore: update building script path.

---
 .gitlab-ci.yml |  8 +-------
 Makefile       | 14 +++++++-------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 564d6c572..3823cd2b4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,7 +23,7 @@ bash:
   image: koalaman/shellcheck-alpine
   script:
     - shellcheck --shell=bash
-        PKGBUILD configure
+        PKGBUILD configure dists/build.sh
         debian/apparmor.d.postinst debian/apparmor.d.postrm
 
 golangci-lint:
@@ -32,12 +32,6 @@ golangci-lint:
   script:
     - golangci-lint run
 
-hadolint:
-  stage: lint
-  image: hadolint/hadolint:latest-alpine
-  script:
-    - hadolint dists/build/*/Dockerfile
-
 sast:
   stage: lint
 
diff --git a/Makefile b/Makefile
index 8c31d684c..8a3dcb9d0 100644
--- a/Makefile
+++ b/Makefile
@@ -36,7 +36,7 @@ install:
 
 auto:
 	@[ ${DISTRIBUTION} = Arch ] || exit 0; \
-		makepkg --syncdeps --install --cleanbuild --force
+		makepkg --syncdeps --install --cleanbuild --force --noconfirm
 	@[ ${DISTRIBUTION} = Ubuntu ] || exit 0; \
 		dch --newversion="${VERSION}" --urgency=medium --distribution=stable --controlmaint "Release ${VERSION}";  \
 		dpkg-buildpackage -b -d --no-sign;  \
@@ -71,23 +71,23 @@ $(P):
 
 lint:
 	@shellcheck --shell=bash \
-		PKGBUILD configure pick dists/build/build.sh \
+		PKGBUILD configure dists/build.sh \
 		debian/${PKGNAME}.postinst debian/${PKGNAME}.postrm
 
 archlinux:
-	@bash dists/build/build.sh archlinux
+	@bash dists/build.sh archlinux
 
 debian:
-	@bash dists/build/build.sh debian
+	@bash dists/build.sh debian
 
 ubuntu:
-	@bash dists/build/build.sh ubuntu
+	@bash dists/build.sh ubuntu
 
 whonix:
-	@bash dists/build/build.sh whonix
+	@bash dists/build.sh whonix
 
 clean:
 	@rm -rf \
 		debian/.debhelper debian/debhelper* debian/*.debhelper debian/${PKGNAME} \
-		${PKGNAME}-*.pkg.tar.zst.sig ${PKGNAME}-*.pkg.tar.zst \
+		${PKGNAME}-*.pkg.tar.zst.sig ${PKGNAME}-*.pkg.tar.zst coverage.out \
 		${PKGNAME}_*.* ${BUILD}