mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-11-16 02:18:28 -07:00
994906fbd4
Merge in DNS/adguard-home from AG-23334-split-snap to master
Squashed commit of the following:
commit 5a3d0f105d6930a0868f342821618a2a4acae282
Merge: bba693db6 06d465b0d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 21 17:10:15 2023 +0300
Merge branch 'master' into AG-23334-split-snap
commit bba693db60fc7e154df3bc6bf186292ee9bc4ed5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 21 16:50:45 2023 +0300
scripts/snap: fix docs; imp data
commit cb4a1d5bed147a41dda69b80b7ae6c3902c26538
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 21 14:03:48 2023 +0300
all: fix scripts; imp docs
commit f88320b16ed7679e151a5358f4ac8e0212b4a827
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jun 20 18:52:21 2023 +0300
all: split snap ci
78 lines
1.7 KiB
Bash
78 lines
1.7 KiB
Bash
#!/bin/sh
|
|
|
|
verbose="${VERBOSE:-0}"
|
|
|
|
if [ "$verbose" -gt '0' ]
|
|
then
|
|
set -x
|
|
fi
|
|
|
|
set -e -f -u
|
|
|
|
# Function log is an echo wrapper that writes to stderr if the caller requested
|
|
# verbosity level greater than 0. Otherwise, it does nothing.
|
|
#
|
|
# TODO(a.garipov): Add to helpers.sh and use more actively in scripts.
|
|
log() {
|
|
if [ "$verbose" -gt '0' ]
|
|
then
|
|
# Don't use quotes to get word splitting.
|
|
echo "$1" 1>&2
|
|
fi
|
|
}
|
|
|
|
version="$( ./AdGuardHome_amd64 --version | cut -d ' ' -f 4 )"
|
|
if [ "$version" = '' ]
|
|
then
|
|
log 'empty version from ./AdGuardHome_amd64'
|
|
exit 1
|
|
fi
|
|
readonly version
|
|
|
|
log "version '$version'"
|
|
|
|
for arch in\
|
|
'i386'\
|
|
'amd64'\
|
|
'armhf'\
|
|
'arm64'
|
|
do
|
|
build_output="./AdGuardHome_${arch}"
|
|
snap_output="./AdGuardHome_${arch}.snap"
|
|
snap_dir="${snap_output}.dir"
|
|
|
|
# Create the meta subdirectory and copy files there.
|
|
mkdir -p "${snap_dir}/meta"
|
|
cp "$build_output" "${snap_dir}/AdGuardHome"
|
|
cp './snap/local/adguard-home-web.sh' "$snap_dir"
|
|
cp -r './snap/gui' "${snap_dir}/meta/"
|
|
|
|
# Create a snap.yaml file, setting the values.
|
|
sed\
|
|
-e 's/%VERSION%/'"$version"'/'\
|
|
-e 's/%ARCH%/'"$arch"'/'\
|
|
./snap/snap.tmpl.yaml\
|
|
> "${snap_dir}/meta/snap.yaml"
|
|
|
|
# TODO(a.garipov): The snapcraft tool will *always* write everything,
|
|
# including errors, to stdout. And there doesn't seem to be a way to change
|
|
# that. So, save the combined output, but only show it when snapcraft
|
|
# actually fails.
|
|
set +e
|
|
snapcraft_output="$(
|
|
snapcraft pack "$snap_dir" --output "$snap_output" 2>&1
|
|
)"
|
|
snapcraft_exit_code="$?"
|
|
set -e
|
|
|
|
if [ "$snapcraft_exit_code" -ne '0' ]
|
|
then
|
|
log "$snapcraft_output"
|
|
exit "$snapcraft_exit_code"
|
|
fi
|
|
|
|
log "$snap_output"
|
|
|
|
rm -f -r "$snap_dir"
|
|
done
|