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
This commit is contained in:
Ainar Garipov 2020-12-31 17:37:19 +03:00
parent 933ca2af2a
commit 2298a9ed09
1 changed files with 2 additions and 2 deletions

View File

@ -184,8 +184,8 @@ build() {
case "$build_os" case "$build_os"
in in
('darwin'|'windows') ('darwin'|'windows')
build_archive="./${dist}/${build_ar}.zip" build_archive="${PWD}/${dist}/${build_ar}.zip"
zip -9 -q "$build_archive" "$build_dir" ( cd "${dist}/${1}" && zip -9 -q -r "$build_archive" "./AdGuardHome" )
;; ;;
(*) (*)
build_archive="./${dist}/${build_ar}.tar.gz" build_archive="./${dist}/${build_ar}.tar.gz"