Skip to content

Commit

Permalink
Pull request: scripts: zip output dir recursively
Browse files Browse the repository at this point in the history
Merge in DNS/adguard-home from 2276-fix-zip to master

Updates #2276.
Updates #2507.

Squashed commit of the following:

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

    scripts: zip output dir recursively
  • Loading branch information
ainar-g committed Dec 31, 2020
1 parent 933ca2a commit 2298a9e
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions scripts/make/build-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 2298a9e

Please sign in to comment.