From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp49.i.mail.ru (smtp49.i.mail.ru [94.100.177.109]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 2EAD6469719 for ; Wed, 7 Oct 2020 16:33:38 +0300 (MSK) From: Artem Starshov Date: Wed, 7 Oct 2020 16:33:32 +0300 Message-Id: <3258554a12b614f5acc4e18ae02c7c0029489c6f.1602077294.git.artemreyt@tarantool.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Tarantool-patches] [PATCH] Fix luacheck warning W122 in extra/dist/tarantoolctl.in List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: tarantool-patches@dev.tarantool.org Changed passing global variable arg to function find_instance_name(arg) instead of passing arg[0] and arg[2] separately. And removed exception in .luacheckrc for file /extra/dist/tarantoolctl.in. This change only solves linter warning, nothing else --- .luacheckrc | 6 ------ extra/dist/tarantoolctl.in | 16 ++++++++-------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/.luacheckrc b/.luacheckrc index 994d29956..2a652cd06 100644 --- a/.luacheckrc +++ b/.luacheckrc @@ -37,12 +37,6 @@ exclude_files = { ".git/**/*.lua", } -files["extra/dist/tarantoolctl.in"] = { - ignore = { - -- https://github.com/tarantool/tarantool/issues/4929 - "122", - }, -} files["src/lua/help.lua"] = { -- Globals defined for interactive mode. globals = {"help", "tutorial"}, diff --git a/extra/dist/tarantoolctl.in b/extra/dist/tarantoolctl.in index 90caf58ad..0726e7f46 100755 --- a/extra/dist/tarantoolctl.in +++ b/extra/dist/tarantoolctl.in @@ -202,19 +202,19 @@ end -- In case there is no explicit instance name, check whether arg[0] is a -- symlink. In that case, the name of the symlink is the instance name. -- -local function find_instance_name(arg0, arg2) - if arg2 ~= nil then - return fio.basename(arg2, '.lua') +local function find_instance_name(arg) + if arg[2] ~= nil then + return fio.basename(arg[2], '.lua') end - local istat = fio.lstat(arg0) + local istat = fio.lstat(arg[0]) if istat == nil then - log.error("Can't stat %s: %s", arg0, errno.strerror()) + log.error("Can't stat %s: %s", arg[0], errno.strerror()) os.exit(1) end if not istat:is_link() then usage(command_name) end - arg[2] = arg0 + arg[2] = arg[0] linkmode = true - return fio.basename(arg0, '.lua') + return fio.basename(arg[0], '.lua') end local function mkdir(dirname) @@ -971,7 +971,7 @@ local function process_remote(cmd_function) end local function process_local(cmd_function) - instance_name = find_instance_name(arg[0], arg[2]) + instance_name = find_instance_name(arg) default_file = find_default_file() load_default_file(default_file) -- 2.28.0