From: Zhang Hua <zhanghuadedn@gmail.com>
Date: Sun, 2 Oct 2022 11:04:12 +0000 (+0800)
Subject: scripts/download.pl: pass aria2 config in ENV only
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a53f29b583dd974b8b65737bab7fbca7753c738c;p=openwrt%2Fstaging%2Fnbd.git

scripts/download.pl: pass aria2 config in ENV only

The aria2c command tries to load config from
${XDG_CONFIG_HOME:-${HOME}/.config}/aria2/aria2.conf by default,
which may result unexpected behavior.

As a replacement, people can use environment variable ARIA2C_OPTIONS
to custom arguments passed to aria2c like curl and wget below.
Including --conf-path=/path/to/config.conf in ARIA2C_OPTIONS can
also set a custom config file path easily if needed.

Signed-off-by: Zhang Hua <zhanghuadedn@gmail.com>
---

diff --git a/scripts/download.pl b/scripts/download.pl
index 79ad8bfea0..0b3f99e9b0 100755
--- a/scripts/download.pl
+++ b/scripts/download.pl
@@ -129,6 +129,7 @@ sub download_cmd {
 			$check_certificate ? () : '--check-certificate=false',
 			"--server-stat-of=$ENV{'TMPDIR'}/aria2c/${rfn}_spp",
 			"--server-stat-if=$ENV{'TMPDIR'}/aria2c/${rfn}_spp",
+			"--daemon=false --no-conf", shellwords($ENV{ARIA2C_OPTIONS} || ''),
 			"-d $ENV{'TMPDIR'}/aria2c -o $rfn;",
 			"cat $ENV{'TMPDIR'}/aria2c/$rfn;",
 			"rm $ENV{'TMPDIR'}/aria2c/$rfn $ENV{'TMPDIR'}/aria2c/${rfn}_spp");