diff --git a/src/copy.lua b/src/copy.lua index 0a693c1..33d651d 100644 --- a/src/copy.lua +++ b/src/copy.lua @@ -24,7 +24,7 @@ end function main(arg) local module = Ansible.new( { src = { required=true } - , original_basename = { required=false } + , _original_basename = { required=false } , content = { required=false } , path = { aliases={'dest'}, required=true } , backup = { default=false, type='bool' } @@ -69,7 +69,7 @@ function main(arg) local dest = File.expanduser(p['path']) local backup = p['backup'] local force = p['force'] - local original_basename = p['original_basename'] + local _original_basename = p['_original_basename'] local validate = p['validate'] local follow = p['follow'] local mode = p['mode'] @@ -92,7 +92,7 @@ function main(arg) local changed = false -- Special handling for recursive copy - create intermediate dirs - if original_basename and string.match(dest, "/$") then + if _original_basename and string.match(dest, "/$") then dest = File.join(dest, orignal_basename) local dirname = File.dirname(dest) if not File.exists(dirname) and File.isabs(dirname) then @@ -113,8 +113,8 @@ function main(arg) end if File.isdir(dest) then local basename = File.basename(src) - if original_basename then - basename = original_basename + if _original_basename then + basename = _original_basename end dest = File.join(dest, basename) end diff --git a/src/file.lua b/src/file.lua index ca29439..a83383d 100644 --- a/src/file.lua +++ b/src/file.lua @@ -112,7 +112,7 @@ function main(arg) local module = Ansible.new( { state = { choices={'file', 'directory', 'link', 'hard', 'touch', 'absent' } } , path = { aliases={'dest', 'name'}, required=true } - , original_basename = { required=false } + , _original_basename = { required=false } , recurse = { default=false, type='bool' } , force = { required=false, default=false, type='bool' } , diff_peek = {} @@ -204,11 +204,11 @@ function main(arg) end end - -- original_basename is used by other modules that depend on file + -- _original_basename is used by other modules that depend on file if File.isdir(path) and ("link" ~= state and "absent" ~= state) then local basename = nil - if params['original_basename'] then - basename = params['original_basename'] + if params['_original_basename'] then + basename = params['_original_basename'] elseif src ~= nil then basename = File.basename(src) end