From: Raymond <raymond.wanyoike@gmail.com>
Date: Tue, 25 Feb 2020 20:14:14 +0000 (+0300)
Subject: luci-app-aria2: fix incorrect "Extra Settings" section option name
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=6709d3a355e6723b8a2ae4f5354c3e917d1b7ac8;p=project%2Fluci.git

luci-app-aria2: fix incorrect "Extra Settings" section option name

The "Extra Settings" section `extra_setting` option name does not match what
the `net/aria2` package expects.

See:

- https://github.com/openwrt/packages/blob/openwrt-19.07/net/aria2/files/aria2.init#L311
- https://github.com/openwrt/packages/blob/openwrt-19.07/net/aria2/files/aria2.conf#L31

Causing the luci UI "Extra Settings" option to have no effect. This fix
renames `extra_setting` => `extra_settings`.

Signed-off-by: Raymond Wanyoike <raymond.wanyoike@gmail.com>
---

diff --git a/applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua b/applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua
index 88068c1365..3927b1765e 100644
--- a/applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua
+++ b/applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua
@@ -484,7 +484,7 @@ s = m:section(NamedSection, "main", "aria2", translate("Extra Settings"),
 s.addremove = false
 s.anonymous = true
 
-o = s:option(DynamicList, "extra_setting", translate("Settings list"),
+o = s:option(DynamicList, "extra_settings", translate("Settings list"),
 	translate("List of extra settings. Format: option=value, eg. <code>netrc-path=/tmp/.netrc</code>."))
 o.placeholder = "option=value"
 
diff --git a/applications/luci-app-aria2/root/etc/uci-defaults/40_luci-aria2 b/applications/luci-app-aria2/root/etc/uci-defaults/40_luci-aria2
index 97ea9ca27c..becc1c6995 100755
--- a/applications/luci-app-aria2/root/etc/uci-defaults/40_luci-aria2
+++ b/applications/luci-app-aria2/root/etc/uci-defaults/40_luci-aria2
@@ -9,7 +9,7 @@ if [ ."$(uci -q get aria2.main)" != ."aria2" ]; then
 		set aria2.main.config_dir="/var/etc/aria2"
 		add_list aria2.main.header=""
 		add_list aria2.main.bt_tracker=""
-		add_list aria2.main.extra_setting=""
+		add_list aria2.main.extra_settings=""
 		commit aria2
 	EOF
 fi