diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/luarocks/add.lua | 2 | ||||
| -rw-r--r-- | src/luarocks/admin_remove.lua | 2 | ||||
| -rw-r--r-- | src/luarocks/cache.lua | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/luarocks/add.lua b/src/luarocks/add.lua index 831d3b92..5bcd887d 100644 --- a/src/luarocks/add.lua +++ b/src/luarocks/add.lua | |||
| @@ -93,7 +93,7 @@ local function add_files_to_server(refresh, rockfiles, server, upload_server) | |||
| 93 | local cmd | 93 | local cmd |
| 94 | if protocol == "rsync" then | 94 | if protocol == "rsync" then |
| 95 | local srv, path = server_path:match("([^/]+)(/.+)") | 95 | local srv, path = server_path:match("([^/]+)(/.+)") |
| 96 | cmd = cfg.variables.RSYNC.." --exclude=.git -Oavz -e ssh "..local_cache.."/ "..user.."@"..srv..":"..path.."/" | 96 | cmd = cfg.variables.RSYNC.." --exclude=.git -Ocavz -e ssh "..local_cache.."/ "..user.."@"..srv..":"..path.."/" |
| 97 | elseif upload_server and upload_server.sftp then | 97 | elseif upload_server and upload_server.sftp then |
| 98 | local part1, part2 = upload_server.sftp:match("^([^/]*)/(.*)$") | 98 | local part1, part2 = upload_server.sftp:match("^([^/]*)/(.*)$") |
| 99 | cmd = cfg.variables.SCP.." "..table.concat(files, " ").." "..user.."@"..part1..":/"..part2 | 99 | cmd = cfg.variables.SCP.." "..table.concat(files, " ").." "..user.."@"..part1..":/"..part2 |
diff --git a/src/luarocks/admin_remove.lua b/src/luarocks/admin_remove.lua index a97026e8..2a4152c6 100644 --- a/src/luarocks/admin_remove.lua +++ b/src/luarocks/admin_remove.lua | |||
| @@ -68,7 +68,7 @@ local function remove_files_from_server(refresh, rockfiles, server, upload_serve | |||
| 68 | index.make_index(local_cache) | 68 | index.make_index(local_cache) |
| 69 | 69 | ||
| 70 | local srv, path = server_path:match("([^/]+)(/.+)") | 70 | local srv, path = server_path:match("([^/]+)(/.+)") |
| 71 | local cmd = "rsync -Oavz --delete -e ssh "..local_cache.."/ "..user.."@"..srv..":"..path.."/" | 71 | local cmd = cfg.variables.RSYNC.." --exclude=.git -Ocavz --delete -e ssh "..local_cache.."/ "..user.."@"..srv..":"..path.."/" |
| 72 | 72 | ||
| 73 | util.printout(cmd) | 73 | util.printout(cmd) |
| 74 | fs.execute(cmd) | 74 | fs.execute(cmd) |
diff --git a/src/luarocks/cache.lua b/src/luarocks/cache.lua index 6ea6e82a..62a6f14b 100644 --- a/src/luarocks/cache.lua +++ b/src/luarocks/cache.lua | |||
| @@ -74,7 +74,7 @@ function refresh_local_cache(server, url, user, password) | |||
| 74 | local ok = false | 74 | local ok = false |
| 75 | if protocol == "rsync" then | 75 | if protocol == "rsync" then |
| 76 | local srv, path = server_path:match("([^/]+)(/.+)") | 76 | local srv, path = server_path:match("([^/]+)(/.+)") |
| 77 | ok = fs.execute(cfg.variables.RSYNC.." -avz -e ssh "..user.."@"..srv..":"..path.."/ "..local_cache.."/") | 77 | ok = fs.execute(cfg.variables.RSYNC.." --exclude=.git -Ocavz -e ssh "..user.."@"..srv..":"..path.."/ "..local_cache.."/") |
| 78 | else | 78 | else |
| 79 | local login_info = "" | 79 | local login_info = "" |
| 80 | if user then login_info = " --user="..user end | 80 | if user then login_info = " --user="..user end |
