From 22d15aaad606d491a996cd220ab884e9e36f5158 Mon Sep 17 00:00:00 2001
From: Ainar Garipov <a.garipov@adguard.com>
Date: Wed, 2 Jun 2021 14:51:56 +0300
Subject: [PATCH] Pull request: scripts: fix install code, docs

Merge in DNS/adguard-home from fix-install to master

Squashed commit of the following:

commit 5fe3ac69b56dc879755bc4fa3d300abb447ab068
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Jun 2 14:45:09 2021 +0300

    scripts: imp docs

commit 13a1dbe95c3f13bedfec34c38e67b0a62047af7c
Merge: 595e0613 f6516cb8
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Jun 2 14:31:48 2021 +0300

    Merge branch 'master' into fix-install

commit 595e061350b2a1ed5ef8c88dba458ecb806e0108
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Jun 2 14:25:14 2021 +0300

    scripts: fix install code, docs
---
 scripts/install.sh | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/scripts/install.sh b/scripts/install.sh
index 6b9e2429..c5e4eaca 100644
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -70,7 +70,7 @@ check_required() {
 	# Don't use quotes to get word splitting.
 	for cmd in ${required}
 	do
-		echo "checking $cmd"
+		log "checking $cmd"
 		if ! is_command "$cmd"
 		then
 			log "the full list of required software: [$required]"
@@ -335,6 +335,7 @@ is_root() {
 		return 0
 	fi
 
+	# TODO(a.garipov): On OpenBSD, use doas.
 	if is_command sudo
 	then
 		log 'note that AdGuard Home requires root privileges to install using this script'
@@ -347,8 +348,9 @@ is_root() {
 please, restart it with root privileges'
 }
 
-# Function rerun_with_root downloads the script and tries to run it with root
-# privileges.  It also uses the configuration that already set.
+# Function rerun_with_root downloads the script, runs it with root privileges,
+# and exits the current script.  It passes the necessary configuration of the
+# current script to the child script.
 #
 # TODO(e.burkov): Try to avoid restarting.
 rerun_with_root() {
@@ -361,10 +363,12 @@ rerun_with_root() {
 	then
 		flags="${flags} -r"
 	fi
+
 	if [ "$uninstall" -eq '1' ]
 	then
 		flags="${flags} -u"
 	fi
+
 	if [ "$verbose" -eq '1' ]
 	then
 		flags="${flags} -v"
@@ -375,7 +379,17 @@ rerun_with_root() {
 
 	log 'restarting with root privileges'
 	
-	curl -L -S -s "$script_url" | sudo sh -s -- $opts
+	# 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 sh -s -- $opts
+
+	# 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
 }
 
 # Function download downloads the file from the URL and saves it to the