From 2298a9ed09eff7fef18152d8bf4ff92e178f7da7 Mon Sep 17 00:00:00 2001
From: Ainar Garipov <a.garipov@adguard.com>
Date: Thu, 31 Dec 2020 17:37:19 +0300
Subject: [PATCH] Pull request: scripts: zip output dir recursively

Merge in DNS/adguard-home from 2276-fix-zip to master

Updates #2276.
Updates #2507.

Squashed commit of the following:

commit 9bd2c53d0aea98fd735655315c33336546f86ccb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Dec 31 17:12:53 2020 +0300

    scripts: zip output dir recursively
---
 scripts/make/build-release.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/make/build-release.sh b/scripts/make/build-release.sh
index 2bc1a04e..4be45616 100644
--- a/scripts/make/build-release.sh
+++ b/scripts/make/build-release.sh
@@ -184,8 +184,8 @@ build() {
 	case "$build_os"
 	in
 	('darwin'|'windows')
-		build_archive="./${dist}/${build_ar}.zip"
-		zip -9 -q "$build_archive" "$build_dir"
+		build_archive="${PWD}/${dist}/${build_ar}.zip"
+		( cd "${dist}/${1}" && zip -9 -q -r "$build_archive" "./AdGuardHome" )
 		;;
 	(*)
 		build_archive="./${dist}/${build_ar}.tar.gz"