From 5996fea6e7d9c6963f98648ca5b7966b7f706008 Mon Sep 17 00:00:00 2001
From: Hisham Muhammad <hisham@gobolinux.org>
Date: Mon, 3 Sep 2012 21:10:51 -0300
Subject: fs.quiet doesn't require external tools

---
 src/luarocks/fs/unix.lua        | 7 +++++++
 src/luarocks/fs/unix/tools.lua  | 7 -------
 src/luarocks/fs/win32.lua       | 7 +++++++
 src/luarocks/fs/win32/tools.lua | 7 -------
 4 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'src')

diff --git a/src/luarocks/fs/unix.lua b/src/luarocks/fs/unix.lua
index 88bafaf6..e0d40970 100644
--- a/src/luarocks/fs/unix.lua
+++ b/src/luarocks/fs/unix.lua
@@ -15,6 +15,13 @@ local util = require("luarocks.util")
 
 math.randomseed(os.time())
 
+--- Annotate command string for quiet execution.
+-- @param cmd string: A command-line string.
+-- @return string: The command-line, with silencing annotation.
+function quiet(cmd)
+   return cmd.." 1> /dev/null 2> /dev/null"
+end
+
 --- Return an absolute pathname from a potentially relative one.
 -- @param pathname string: pathname to convert.
 -- @param relative_to string or nil: path to prepend when making
diff --git a/src/luarocks/fs/unix/tools.lua b/src/luarocks/fs/unix/tools.lua
index 54120e91..3cee8a30 100644
--- a/src/luarocks/fs/unix/tools.lua
+++ b/src/luarocks/fs/unix/tools.lua
@@ -14,13 +14,6 @@ local function command_at(directory, cmd)
    return "cd " .. fs.Q(directory) .. " && " .. cmd
 end
 
---- Annotate command string for quiet execution.
--- @param cmd string: A command-line string.
--- @return string: The command-line, with silencing annotation.
-function quiet(cmd)
-   return cmd.." 1> /dev/null 2> /dev/null"
-end
-
 --- Obtain current directory.
 -- Uses the module's internal directory stack.
 -- @return string: the absolute pathname of the current directory.
diff --git a/src/luarocks/fs/win32.lua b/src/luarocks/fs/win32.lua
index 98daf13f..cbf5fc60 100644
--- a/src/luarocks/fs/win32.lua
+++ b/src/luarocks/fs/win32.lua
@@ -8,6 +8,13 @@ local fs = require("luarocks.fs")
 local cfg = require("luarocks.cfg")
 local dir = require("luarocks.dir")
 
+--- Annotate command string for quiet execution.
+-- @param cmd string: A command-line string.
+-- @return string: The command-line, with silencing annotation.
+function quiet(cmd)
+   return cmd.." 2> NUL 1> NUL"
+end
+
 --- Quote argument for shell processing. Fixes paths on Windows.
 -- Adds single quotes and escapes.
 -- @param arg string: Unquoted argument.
diff --git a/src/luarocks/fs/win32/tools.lua b/src/luarocks/fs/win32/tools.lua
index b250076a..48eca64b 100644
--- a/src/luarocks/fs/win32/tools.lua
+++ b/src/luarocks/fs/win32/tools.lua
@@ -32,13 +32,6 @@ local function command_at(directory, cmd)
    return cmd
 end
 
---- Annotate command string for quiet execution.
--- @param cmd string: A command-line string.
--- @return string: The command-line, with silencing annotation.
-function quiet(cmd)
-   return cmd.." 2> NUL 1> NUL"
-end
-
 --- Obtain current directory.
 -- Uses the module's internal directory stack.
 -- @return string: the absolute pathname of the current directory.
-- 
cgit v1.2.3-55-g6feb