From b8d55eaffe08d9365be3e1c00a392a5aa77b4fde Mon Sep 17 00:00:00 2001 From: Eugene Burkov Date: Tue, 7 Feb 2023 15:56:40 +0300 Subject: [PATCH] Pull request: 5431 FreeBSD install script Merge in DNS/adguard-home from 5431-freebsd-install-script to master Updates #5431. Squashed commit of the following: commit a36127e5349bcff572644d0636bbfa91f4a679bb Author: Eugene Burkov Date: Tue Feb 7 15:45:35 2023 +0300 all: imp docs commit c0f2f686c4aa0953345f9c441deddadcd0a3861e Author: Eugene Burkov Date: Tue Feb 7 14:20:57 2023 +0300 scripts: add fetch(1) support --- README.md | 14 +++++++++++++- scripts/install.sh | 15 +++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 1f2bc7a3..73e09556 100644 --- a/README.md +++ b/README.md @@ -81,12 +81,24 @@ code. ### Automated install (Unix) -Run the following command in your terminal: +To install with `curl` run the following command: ```sh curl -s -S -L https://raw.githubusercontent.com/AdguardTeam/AdGuardHome/master/scripts/install.sh | sh -s -- -v ``` +To install with `wget` run the following command: + +```sh +wget --no-verbose -O - https://raw.githubusercontent.com/AdguardTeam/AdGuardHome/master/scripts/install.sh | sh -s -- -v +``` + +To install with `fetch` run the following command: + +```sh +fetch -o - https://raw.githubusercontent.com/AdguardTeam/AdGuardHome/master/scripts/install.sh | sh -s -- -v +``` + The script also accepts some options: * `-c ` to use specified channel; diff --git a/scripts/install.sh b/scripts/install.sh index 5931fd3c..58fd37fe 100644 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -338,6 +338,18 @@ download_wget() { wget --no-verbose -O "$wget_output" "$1" } +# download_fetch uses fetch(1) to download a file. The first argument is the +# URL. The second argument is optional and is the output file. +download_fetch() { + fetch_output="${2:-}" + if [ "$fetch_output" = '' ] + then + fetch -o '-' "$1" + else + fetch -o "$fetch_output" "$1" + fi +} + # Function set_download_func sets the appropriate function for downloading # files. set_download_func() { @@ -348,6 +360,9 @@ set_download_func() { elif is_command 'wget' then download_func='download_wget' + elif is_command 'fetch' + then + download_func='download_fetch' else error_exit "either curl or wget is required to install AdGuard Home via this script" fi