diff options
| author | Thijs Schreijer <thijs@thijsschreijer.nl> | 2013-04-20 03:10:38 -0700 |
|---|---|---|
| committer | Thijs Schreijer <thijs@thijsschreijer.nl> | 2013-04-20 03:10:38 -0700 |
| commit | 109ee2cdc00008d06a72f6e24e56a6e997eeb991 (patch) | |
| tree | 48f202a531dfcd758e4bb3cae7c312c800414c83 | |
| parent | 4a13290379eb5f112720f248936229c67558fcfe (diff) | |
| parent | 1bab385c2ce4f37f808774540c6fe3b46afdda68 (diff) | |
| download | luarocks-109ee2cdc00008d06a72f6e24e56a6e997eeb991.tar.gz luarocks-109ee2cdc00008d06a72f6e24e56a6e997eeb991.tar.bz2 luarocks-109ee2cdc00008d06a72f6e24e56a6e997eeb991.zip | |
Merge pull request #128 from Tieske/removed_win_workaround
Removed windows workaround
| -rw-r--r-- | src/luarocks/fs/win32/tools.lua | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/luarocks/fs/win32/tools.lua b/src/luarocks/fs/win32/tools.lua index c563b137..033f71be 100644 --- a/src/luarocks/fs/win32/tools.lua +++ b/src/luarocks/fs/win32/tools.lua | |||
| @@ -146,8 +146,7 @@ end | |||
| 146 | -- plus an error message. | 146 | -- plus an error message. |
| 147 | function copy_contents(src, dest) | 147 | function copy_contents(src, dest) |
| 148 | assert(src and dest) | 148 | assert(src and dest) |
| 149 | if fs.execute_string(fs.quiet("xcopy "..src.."\\*.* "..fs.Q(dest).." /S/E/Y")) then | 149 | if fs.execute_string(fs.quiet(vars.CP.." -a "..src.."\\*.* "..fs.Q(dest))) then |
| 150 | --if fs.execute_string(fs.quiet(vars.CP.." -a "..src.."\\*.* "..fs.Q(dest))) then | ||
| 151 | return true | 150 | return true |
| 152 | else | 151 | else |
| 153 | return false, "Failed copying "..src.." to "..dest | 152 | return false, "Failed copying "..src.." to "..dest |