From 890e7bbb3907a913a461a3320beed8dc987448d9 Mon Sep 17 00:00:00 2001 From: Hisham Muhammad Date: Sun, 22 Sep 2013 16:18:09 -0300 Subject: factor out rsync flags to make them consistent --- src/luarocks/add.lua | 2 +- src/luarocks/admin_remove.lua | 2 +- src/luarocks/cache.lua | 2 +- src/luarocks/cfg.lua | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/luarocks/add.lua b/src/luarocks/add.lua index 5bcd887d..f1142d2a 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 -Ocavz -e ssh "..local_cache.."/ "..user.."@"..srv..":"..path.."/" + cmd = cfg.variables.RSYNC.." "..cfg.variables.RSYNCFLAGS.." -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 2a4152c6..d429ce59 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 = cfg.variables.RSYNC.." --exclude=.git -Ocavz --delete -e ssh "..local_cache.."/ "..user.."@"..srv..":"..path.."/" + local cmd = cfg.variables.RSYNC.." "..cfg.variables.RSYNCFLAGS.." --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 62a6f14b..a3dfe8b1 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.." --exclude=.git -Ocavz -e ssh "..user.."@"..srv..":"..path.."/ "..local_cache.."/") + ok = fs.execute(cfg.variables.RSYNC.." "..cfg.variables.RSYNCFLAGS.." -e ssh "..user.."@"..srv..":"..path.."/ "..local_cache.."/") else local login_info = "" if user then login_info = " --user="..user end diff --git a/src/luarocks/cfg.lua b/src/luarocks/cfg.lua index 62c69597..8e26bb46 100644 --- a/src/luarocks/cfg.lua +++ b/src/luarocks/cfg.lua @@ -250,6 +250,7 @@ local defaults = { CMAKE = "cmake", SEVENZ = "7z", + RSYNCFLAGS = "--exclude=.git -Ocavz", STATFLAG = "-c '%a'", }, -- cgit v1.2.3-55-g6feb