From 319f8f619c9457c8ba426d8bbe0b1d2d74c02e5d Mon Sep 17 00:00:00 2001 From: Peter Melnichenko Date: Sat, 7 May 2016 14:14:08 +0300 Subject: fs.win32.tools: move a local function closer to its usage --- src/luarocks/fs/win32/tools.lua | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/src/luarocks/fs/win32/tools.lua b/src/luarocks/fs/win32/tools.lua index f112ea3e..aa405e14 100644 --- a/src/luarocks/fs/win32/tools.lua +++ b/src/luarocks/fs/win32/tools.lua @@ -11,17 +11,6 @@ local cfg = require("luarocks.cfg") local vars = cfg.variables ---- Strip the last extension of a filename. --- Example: "foo.tar.gz" becomes "foo.tar". --- If filename has no dots, returns it unchanged. --- @param filename string: The file name to strip. --- @return string: The stripped name. -local function strip_extension(filename) - assert(type(filename) == "string") - - return (filename:gsub("%.[^.]+$", "")) or filename -end - local function command_at(directory, cmd) local drive = directory:match("^([A-Za-z]:)") cmd = "cd " .. fs.Q(directory) .. " & " .. cmd @@ -195,6 +184,16 @@ function tools.is_file(file) return fs.execute(fs.Q(vars.TEST).." -f", file) end +--- Strip the last extension of a filename. +-- Example: "foo.tar.gz" becomes "foo.tar". +-- If filename has no dots, returns it unchanged. +-- @param filename string: The file name to strip. +-- @return string: The stripped name. +local function strip_extension(filename) + assert(type(filename) == "string") + return (filename:gsub("%.[^.]+$", "")) or filename +end + --- Uncompress gzip file. -- @param archive string: Filename of archive. -- @return boolean : success status -- cgit v1.2.3-55-g6feb