From 9d3d6e5d6ccbfc5774948c295eac87955a23a2a7 Mon Sep 17 00:00:00 2001 From: Hisham Muhammad Date: Sat, 21 Sep 2013 11:29:21 -0300 Subject: Make sure .git is not rsync'd --- src/luarocks/add.lua | 2 +- src/luarocks/admin_remove.lua | 2 +- 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) local cmd if protocol == "rsync" then local srv, path = server_path:match("([^/]+)(/.+)") - cmd = cfg.variables.RSYNC.." --exclude=.git -Oavz -e ssh "..local_cache.."/ "..user.."@"..srv..":"..path.."/" + cmd = cfg.variables.RSYNC.." --exclude=.git -Ocavz -e ssh "..local_cache.."/ "..user.."@"..srv..":"..path.."/" elseif upload_server and upload_server.sftp then local part1, part2 = upload_server.sftp:match("^([^/]*)/(.*)$") 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 index.make_index(local_cache) local srv, path = server_path:match("([^/]+)(/.+)") - local cmd = "rsync -Oavz --delete -e ssh "..local_cache.."/ "..user.."@"..srv..":"..path.."/" + local cmd = cfg.variables.RSYNC.." --exclude=.git -Ocavz --delete -e ssh "..local_cache.."/ "..user.."@"..srv..":"..path.."/" util.printout(cmd) 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) local ok = false if protocol == "rsync" then local srv, path = server_path:match("([^/]+)(/.+)") - ok = fs.execute(cfg.variables.RSYNC.." -avz -e ssh "..user.."@"..srv..":"..path.."/ "..local_cache.."/") + ok = fs.execute(cfg.variables.RSYNC.." --exclude=.git -Ocavz -e ssh "..user.."@"..srv..":"..path.."/ "..local_cache.."/") else local login_info = "" if user then login_info = " --user="..user end -- cgit v1.2.3-55-g6feb