daxi20/AdGuardHome
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

all: upd chlog, minimize diff to master

Browse Source
This commit is contained in:
Ainar Garipov
2022-01-28 17:44:10 +03:00
parent 119100924c
commit 4813b4de25
7 changed files with 36 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
scripts/install.sh
View File

@@ -384,16 +384,15 @@ rerun_with_root() {
log 'restarting with root privileges'
# Group curl together with an echo, so that if curl fails before
# producing any output, the echo prints an exit command for the
# following shell to execute to prevent it from getting an empty input
# and exiting with a zero code in that case.
# Group curl together with an echo, so that if curl fails before producing
# any output, the echo prints an exit command for the following shell to
# execute to prevent it from getting an empty input and exiting with a zero
# code in that case.
{ curl -L -S -s "$script_url" || echo 'exit 1'; }\
| $sudo_cmd sh -s -- -c "$channel" -C "$cpu" -O "$os" -o "$out_dir" "$r" "$u" "$v"
# Exit the script. Since if the code of the previous pipeline is
# non-zero, the execution won't reach this point thanks to set -e, exit
# with zero.
# Exit the script. Since if the code of the previous pipeline is non-zero,
# the execution won't reach this point thanks to set -e, exit with zero.
exit 0
}
@@ -483,11 +482,7 @@ handle_existing() {
# Function install_service tries to install AGH as service.
install_service() {
# Installing as root is required at least on FreeBSD.
#
# TODO(e.burkov): Think about AGH's output suppressing with no verbose
# flag.
if ( cd "$agh_dir" && $sudo_cmd ./AdGuardHome -s install )
if ( cd "$agh_dir" && ./AdGuardHome -s install )
then
return 0
fi