aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabio Mascarenhas <mascarenhas@acm.org>2013-04-12 17:04:33 -0300
committerFabio Mascarenhas <mascarenhas@acm.org>2013-04-12 17:04:33 -0300
commit8db9fafd0686e1e9ef7092fc9f68e72e45ed26c9 (patch)
treeaea7d2c18520792e4de41acd22d8074a0627aca4
parent2b7ffae887b922af8224d1990fb0a72980dd363a (diff)
downloadluarocks-8db9fafd0686e1e9ef7092fc9f68e72e45ed26c9.tar.gz
luarocks-8db9fafd0686e1e9ef7092fc9f68e72e45ed26c9.tar.bz2
luarocks-8db9fafd0686e1e9ef7092fc9f68e72e45ed26c9.zip
fix syntax error on new verbose option
-rw-r--r--src/luarocks/fs/win32/tools.lua10
-rw-r--r--win32/bin/rclauncher.c (renamed from src/bin/rclauncher.c)0
-rw-r--r--win32/bin/rclauncher.obin3377 -> 0 bytes
-rw-r--r--win32/bin/rclauncher.objbin4339 -> 0 bytes
4 files changed, 5 insertions, 5 deletions
diff --git a/src/luarocks/fs/win32/tools.lua b/src/luarocks/fs/win32/tools.lua
index eabf125e..c563b137 100644
--- a/src/luarocks/fs/win32/tools.lua
+++ b/src/luarocks/fs/win32/tools.lua
@@ -9,11 +9,11 @@ local dir = require("luarocks.dir")
9local cfg = require("luarocks.cfg") 9local cfg = require("luarocks.cfg")
10 10
11local dir_stack = {} 11local dir_stack = {}
12 12
13local vars = cfg.variables 13local vars = cfg.variables
14 14
15local function pack(...) 15local function pack(...)
16 return { n = select("#", ...), ... } 16 return { n = select("#", ...), ... }
17end 17end
18 18
19--- Strip the last extension of a filename. 19--- Strip the last extension of a filename.
@@ -56,12 +56,12 @@ end
56-- otherwise. 56-- otherwise.
57function execute_string(cmd) 57function execute_string(cmd)
58 cmd = command_at(fs.current_dir(), cmd) 58 cmd = command_at(fs.current_dir(), cmd)
59 if cfg.verbose then print("Executing: "..tostring(cmd) end 59 if cfg.verbose then print("Executing: "..tostring(cmd)) end
60 local code = pack(os.execute(cmd)) 60 local code = pack(os.execute(cmd))
61 if cfg.verbose then 61 if cfg.verbose then
62 print("Results: "..tostring(code.n)) 62 print("Results: "..tostring(code.n))
63 for i = 1,code.n do 63 for i = 1,code.n do
64 print(" "..tostring(i).." ("..type(code[i]).."): "..tostring(code[i])) 64 print(" "..tostring(i).." ("..type(code[i]).."): "..tostring(code[i]))
65 end 65 end
66 print() 66 print()
67 end 67 end
diff --git a/src/bin/rclauncher.c b/win32/bin/rclauncher.c
index 60284638..60284638 100644
--- a/src/bin/rclauncher.c
+++ b/win32/bin/rclauncher.c
diff --git a/win32/bin/rclauncher.o b/win32/bin/rclauncher.o
deleted file mode 100644
index 824d3b6e..00000000
--- a/win32/bin/rclauncher.o
+++ /dev/null
Binary files differ
diff --git a/win32/bin/rclauncher.obj b/win32/bin/rclauncher.obj
deleted file mode 100644
index 86a32795..00000000
--- a/win32/bin/rclauncher.obj
+++ /dev/null
Binary files differ