Tarantool development patches archive
 help / color / mirror / Atom feed
From: Artem Starshov <artemreyt@tarantool.org>
To: Alexander Turenko <alexander.turenko@tarantool.org>
Cc: tarantool-patches@dev.tarantool.org
Subject: [Tarantool-patches] [PATCH] luacheck: fixed warning in tarantoolctl.in
Date: Wed, 14 Oct 2020 15:14:08 +0300	[thread overview]
Message-ID: <2a19304adfd3877d0fa26cde1d8d8c313a291588.1602677553.git.artemreyt@tarantool.org> (raw)

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.

Brach: https://github.com/tarantool/tarantool/tree/artemreyt/gh-4929-luacheck-warning-tarantoolctl
Issue: https://github.com/tarantool/tarantool/issues/4929

Fixed #4929.
---
 .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

             reply	other threads:[~2020-10-14 12:14 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-14 12:14 Artem Starshov [this message]
2020-10-14 13:11 ` Leonid Vasiliev
2020-10-14 23:04 ` Alexander Turenko

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=2a19304adfd3877d0fa26cde1d8d8c313a291588.1602677553.git.artemreyt@tarantool.org \
    --to=artemreyt@tarantool.org \
    --cc=alexander.turenko@tarantool.org \
    --cc=tarantool-patches@dev.tarantool.org \
    --subject='Re: [Tarantool-patches] [PATCH] luacheck: fixed warning in tarantoolctl.in' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox