Merge pull request #1748 from bobcanthelpyou/luacheck_warnings

treewide: fix luacheck warnings

package/gluon-authorized-keys/luasrc/lib/gluon/upgrade/100-authorized-keys

@@ -5,7 +5,7 @@ local file = '/etc/dropbear/authorized_keys'
 
 local keys = {}
 
-function load_keys()
+local function load_keys()
   for line in io.lines(file) do
     keys[line] = true
   end

package/gluon-config-mode-contact-info/luasrc/lib/gluon/config-mode/wizard/0500-contact-info.lua

@@ -2,8 +2,6 @@ return function(form, uci)
 	local pkg_i18n = i18n 'gluon-config-mode-contact-info'
 	local site_i18n = i18n 'gluon-site'
 
-	local site = require 'gluon.site'
-
 	local owner = uci:get_first("gluon-node-info", "owner")
 
 	local help = site_i18n._translate("gluon-config-mode:contact-help") or pkg_i18n.translate(

package/gluon-config-mode-domain-select/luasrc/lib/gluon/config-mode/wizard/0200-domain-select.lua

@@ -7,7 +7,8 @@ return function(form, uci)
 	local util = require 'gluon.util'
 
 	local selected_domain = uci:get('gluon', 'core', 'domain')
-	local configured = uci:get_first('gluon-setup-mode','setup_mode', 'configured') == '1' or (selected_domain ~= site.default_domain())
+	local configured = uci:get_first('gluon-setup-mode','setup_mode', 'configured') == '1' or
+		(selected_domain ~= site.default_domain())
 
 	local function hide_domain_code(domain, code)
 		if configured and code == selected_domain then

package/gluon-config-mode-geo-location-osm/luasrc/usr/lib/lua/gluon/config-mode/geo-location-osm.lua

@@ -9,7 +9,8 @@ M.MapValue = osm.MapValue
 function M.help(i18n)
 	local pkg_i18n = i18n 'gluon-config-mode-geo-location-osm'
 	return pkg_i18n.translate(
-		'You may also select the position on the map displayed below if your computer is connected to the internet at the moment.'
+		'You may also select the position on the map displayed below '
+		.. 'if your computer is connected to the internet at the moment.'
 	)
 end
 

package/gluon-config-mode-geo-location/luasrc/lib/gluon/config-mode/wizard/0400-geo-location.lua

@@ -43,7 +43,7 @@ return function(form, uci)
 		end
 	end
 
-	local map = {}
+	local map
 	if osm then
 		map = s:option(osm.MapValue, "map", osm.options())
 		map:depends(share_location, true)
@@ -56,7 +56,9 @@ return function(form, uci)
 	function o:write(data)
 		uci:set("gluon-node-info", location, "latitude", data)
 	end
-	map.lat = o
+	if osm then
+		map.lat = o
+	end
 
 	o = s:option(Value, "longitude", pkg_i18n.translate("Longitude"), pkg_i18n.translatef("e.g. %s", "10.689901"))
 	o.default = uci:get("gluon-node-info", location, "longitude")
@@ -65,7 +67,9 @@ return function(form, uci)
 	function o:write(data)
 		uci:set("gluon-node-info", location, "longitude", data)
 	end
-	map.lon = o
+	if osm then
+		map.lon = o
+	end
 
 	if show_altitude then
 		o = s:option(Value, "altitude",

package/gluon-config-mode-hostname/luasrc/lib/gluon/config-mode/wizard/0100-hostname.lua

@@ -14,7 +14,8 @@ return function(form, uci)
 
 	local current_hostname = pretty_hostname.get(uci)
 	local default_hostname = util.default_hostname()
-	local configured = uci:get_first('gluon-setup-mode', 'setup_mode', 'configured', false) or (current_hostname ~= default_hostname)
+	local configured = uci:get_first('gluon-setup-mode', 'setup_mode', 'configured', false) or
+		(current_hostname ~= default_hostname)
 
 	local s = form:section(Section)
 	local o = s:option(Value, "hostname", pkg_i18n.translate("Node name"))

package/gluon-core/check_site.lua

@@ -39,8 +39,8 @@ for _, config in ipairs({'wifi24', 'wifi5'}) do
 		elseif config == 'wifi5' then
 			local channels = {
 				34, 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56, 58, 60, 62,
-				64, 96, 100, 102, 104, 106, 108, 110, 112, 114, 116, 118, 
-				120, 122, 124, 126, 128, 132, 134, 136, 138, 140, 142, 144, 
+				64, 96, 100, 102, 104, 106, 108, 110, 112, 114, 116, 118,
+				120, 122, 124, 126, 128, 132, 134, 136, 138, 140, 142, 144,
 				149, 151, 153, 155, 157, 159, 161, 165, 169, 173 }
 			need_one_of({config, 'channel'}, channels)
 			need_chanlist({config, 'outdoor_chanlist'}, channels, false)

package/gluon-core/luasrc/lib/gluon/upgrade/020-interfaces

@@ -8,7 +8,6 @@ if sysconfig.lan_ifname or sysconfig.wan_ifname then
 end
 
 
-local util = require 'gluon.util'
 local platform = require 'gluon.platform'
 local site = require 'gluon.site'
 

package/gluon-core/luasrc/lib/gluon/upgrade/180-outdoors

@@ -15,7 +15,7 @@ local sysconfig = require 'gluon.sysconfig'
 local platform = require 'gluon.platform'
 
 local config = site.wifi5.outdoors('preset')
-local outdoor = false
+local outdoor
 
 if sysconfig.gluon_version then
 	-- don't enable the outdoor mode after an upgrade

package/gluon-core/luasrc/lib/gluon/upgrade/200-wireless

@@ -16,14 +16,12 @@ if not sysconfig.gluon_version then
 	-- capable of operating in the 2.4 GHz and 5 GHz band need
 	-- to be distributed evenly.
 	local radio_band_count = {band24=0, band5=0}
-	util.foreach_radio(uci, function(radio, index, config)
+	util.foreach_radio(uci, function(radio)
 		local hwmodes = iwinfo.nl80211.hwmodelist(util.find_phy(radio))
-		if (hwmodes.a or hwmodes.ac) and hwmodes.g then
-			-- Dualband - do nothing in this step
-		elseif hwmodes.g then
+		if hwmodes.g and not (hwmodes.a or hwmodes.ac) then
 			-- 2.4 GHz
 			radio_band_count["band24"] = radio_band_count["band24"] + 1
-		elseif hwmodes.a or hwmodes.ac then
+		elseif (hwmodes.a or hwmodes.ac) and not hwmodes.g then
 			-- 5 GHz
 			radio_band_count["band5"] = radio_band_count["band5"] + 1
 		end
@@ -31,7 +29,7 @@ if not sysconfig.gluon_version then
 
 	-- Use the number of all fixed 2.4G GHz and 5 GHz radios to
 	-- distribute dualband radios in this step.
-	util.foreach_radio(uci, function(radio, index, config)
+	util.foreach_radio(uci, function(radio)
 		local radio_name = radio['.name']
 		local hwmodes = iwinfo.nl80211.hwmodelist(util.find_phy(radio))
 		if (hwmodes.a or hwmodes.ac) and hwmodes.g then

package/gluon-core/luasrc/lib/gluon/upgrade/500-opkg

@@ -46,7 +46,7 @@ for line in io.lines('/etc/opkg/distfeeds.conf') do
 	table.insert(distfeeds, line)
 end
 
-local f = io.open('/etc/opkg/distfeeds.conf', 'w')
+f = io.open('/etc/opkg/distfeeds.conf', 'w')
 
 for _, line in ipairs(distfeeds) do
 	local name = line:match('^src/gz%s' .. prefix .. '(%S+)%s')
@@ -62,7 +62,7 @@ end
 f:close()
 
 if next(extra) then
-	local f = io.open('/etc/opkg/gluon.conf', 'w')
+	f = io.open('/etc/opkg/gluon.conf', 'w')
 
 	for k, v in pairs(extra) do
 		f:write(string.format('src/gz %s %s\n', k, replace_patterns(v)))

package/gluon-core/luasrc/usr/lib/lua/gluon/iputil.lua

@@ -85,10 +85,9 @@ function M.mac_to_ip(prefix, mac)
 	local h3 = 0x100 * m5 + tonumber(m6, 16)
 	local h4 = 0x100 * tonumber(m7, 16) + tonumber(m8, 16)
 
-	local prefix, plen = string.match(prefix, '(.*)/(%d+)')
-	plen = tonumber(plen, 10)
+	prefix = string.match(prefix, '(.*)/%d+')
 
-	local p1, p2, p3, p4, p5, p6, p7, p8 = M.IPv6(prefix)
+	local p1, p2, p3, p4 = M.IPv6(prefix)
 
 	return string.format("%x:%x:%x:%x:%x:%x:%x:%x/%d", p1, p2, p3, p4, h1, h2, h3, h4, 128)
 end

package/gluon-core/luasrc/usr/lib/lua/gluon/util.lua

@@ -157,7 +157,7 @@ function M.find_phy(config)
 	end
 end
 
-local function get_addresses(uci, radio)
+local function get_addresses(radio)
 	local phy = M.find_phy(radio)
 	if not phy then
 		return function() end
@@ -200,11 +200,11 @@ function M.generate_mac(i)
 	return string.format('%02x:%s:%s:%s:%s:%02x', m1, m2, m3, m4, m5, m6)
 end
 
-local function get_wlan_mac_from_driver(uci, radio, vif)
+local function get_wlan_mac_from_driver(radio, vif)
 	local primary = sysconfig.primary_mac:lower()
 
 	local addresses = {}
-	for address in get_addresses(uci, radio) do
+	for address in get_addresses(radio) do
 		if address:lower() ~= primary then
 			table.insert(addresses, address)
 		end
@@ -222,8 +222,8 @@ local function get_wlan_mac_from_driver(uci, radio, vif)
 	end
 end
 
-function M.get_wlan_mac(uci, radio, index, vif)
-	local addr = get_wlan_mac_from_driver(uci, radio, vif)
+function M.get_wlan_mac(_, radio, index, vif)
+	local addr = get_wlan_mac_from_driver(radio, vif)
 	if addr then
 		return addr
 	end

package/gluon-mesh-babel/luasrc/lib/gluon/upgrade/300-gluon-mesh-babel-mkconfig

@@ -3,7 +3,7 @@
 local site = require 'gluon.site'
 local babelconf='/etc/gluon-babeld.conf'
 
-file = io.open(babelconf, "w")
+local file = io.open(babelconf, "w")
 file:write("ipv6-subtrees true\n")
 file:write("reflect-kernel-metric true\n")
 file:write("export-table 254\n")

package/gluon-mesh-batman-adv/luasrc/lib/gluon/upgrade/320-gluon-mesh-batman-adv-client-bridge

@@ -5,7 +5,6 @@
 
 
 local site = require 'gluon.site'
-local sysconfig = require 'gluon.sysconfig'
 local util = require 'gluon.util'
 local uci = require('simple-uci').cursor()
 
@@ -39,7 +38,7 @@ local networks = uci:get_list('firewall', 'mesh', 'network')
 util.add_to_set(networks, 'client')
 uci:set_list('firewall', 'mesh', 'network', networks)
 
-local networks = uci:get_list('firewall', 'drop', 'network')
+networks = uci:get_list('firewall', 'drop', 'network')
 util.remove_from_set(networks, 'client')
 uci:set_list('firewall', 'drop', 'network', networks)
 

package/gluon-mesh-vpn-fastd/check_site.lua

@@ -2,7 +2,8 @@ local fastd_methods = {'salsa2012+gmac', 'salsa2012+umac', 'null+salsa2012+gmac'
 need_array_of({'mesh_vpn', 'fastd', 'methods'}, fastd_methods)
 need_boolean(in_site({'mesh_vpn', 'fastd', 'configurable'}), false)
 
-need_one_of(in_site({'mesh_vpn', 'fastd', 'syslog_level'}), {'error', 'warn', 'info', 'verbose', 'debug', 'debug2'}, false)
+need_one_of(in_site({'mesh_vpn', 'fastd', 'syslog_level'}),
+	{'error', 'warn', 'info', 'verbose', 'debug', 'debug2'}, false)
 
 local function check_peer(k)
 	need_alphanumeric_key(k)

package/gluon-scheduled-domain-switch/check_site.lua

-if need_table(in_domain({'domain_switch'}), check_domain_switch, false) then
+if need_table(in_domain({'domain_switch'}), nil, false) then
 	need_domain_name(in_domain({'domain_switch', 'target_domain'}))
 	need_number(in_domain({'domain_switch', 'switch_after_offline_mins'}))
 	need_number(in_domain({'domain_switch', 'switch_time'}))

package/gluon-scheduled-domain-switch/luasrc/lib/gluon/upgrade/950-gluon-scheduled-domain-switch

 #!/usr/bin/lua
 
-local json = require 'jsonc'
 local site = require 'gluon.site'
-local unistd = require 'posix.unistd'
 
 local cronfile = "/usr/lib/micron.d/gluon-scheduled-domain-switch"
 

package/gluon-scheduled-domain-switch/luasrc/usr/bin/gluon-switch-domain

@@ -6,7 +6,7 @@ local util = require 'gluon.util'
 local site = require 'gluon.site'
 
 -- Returns true if node was offline long enough to perform domain switch
-function switch_after_min_reached()
+local function switch_after_min_reached()
 	if not unistd.access("/tmp/gluon_offline") then
 		return false
 	end
@@ -33,7 +33,7 @@ function switch_after_min_reached()
 end
 
 -- Returns true in case switch time has passed
-function switch_time_passed()
+local function switch_time_passed()
 	local current_time = os.time()
 	local switch_time = site.domain_switch.switch_time()
 

package/gluon-web-admin/luasrc/lib/gluon/config-mode/controller/admin/upgrade.lua

@@ -15,10 +15,11 @@ package 'gluon-web-admin'
 local util = require 'gluon.util'
 local unistd = require 'posix.unistd'
 
+local file
 local tmpfile = "/tmp/firmware.img"
 
 
-local function filehandler(meta, chunk, eof)
+local function filehandler(_, chunk, eof)
 	if not unistd.access(tmpfile) and not file and chunk and #chunk > 0 then
 		file = io.open(tmpfile, "w")
 	end
@@ -33,7 +34,6 @@ end
 local function action_upgrade(http, renderer)
 	local fcntl = require 'posix.fcntl'
 	local stat = require 'posix.sys.stat'
-	local wait = require 'posix.sys.wait'
 
 	local function fork_exec(argv)
 		local pid = unistd.fork()
@@ -63,15 +63,15 @@ local function action_upgrade(http, renderer)
 		end
 	end
 
-	local function image_supported(tmpfile)
-		return (os.execute(string.format("exec /sbin/sysupgrade -T %q >/dev/null", tmpfile)) == 0)
+	local function image_supported(supported_tmpfile)
+		return (os.execute(string.format("exec /sbin/sysupgrade -T %q >/dev/null", supported_tmpfile)) == 0)
 	end
 
 	local function storage_size()
 		local size = 0
 		if unistd.access("/proc/mtd") then
 			for l in io.lines("/proc/mtd") do
-				local d, s, e, n = l:match('^([^%s]+)%s+([^%s]+)%s+([^%s]+)%s+"([^%s]+)"')
+				local s, n = l:match('^[^%s]+%s+([^%s]+)%s+[^%s]+%s+"([^%s]+)"')
 				if n == "linux" then
 					size = tonumber(s, 16)
 					break
@@ -79,7 +79,7 @@ local function action_upgrade(http, renderer)
 			end
 		elseif unistd.access("/proc/partitions") then
 			for l in io.lines("/proc/partitions") do
-				local x, y, b, n = l:match('^%s*(%d+)%s+(%d+)%s+([^%s]+)%s+([^%s]+)')
+				local b, n = l:match('^%s*%d+%s+%d+%s+([^%s]+)%s+([^%s]+)')
 				if b and n and not n:match('[0-9]') then
 					size = tonumber(b) * 1024
 					break
@@ -89,8 +89,8 @@ local function action_upgrade(http, renderer)
 		return size
 	end
 
-	local function image_checksum(tmpfile)
-		return (util.exec(string.format("exec sha256sum %q", tmpfile)):match("^([^%s]+)"))
+	local function image_checksum(checksum_tmpfile)
+		return (util.exec(string.format("exec sha256sum %q", checksum_tmpfile)):match("^([^%s]+)"))
 	end