diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-06-27 07:55:17 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-06-27 07:55:17 +0000 |
commit | 10fcca8f153e7d5265bed2a8b42e945f2be7819b (patch) | |
tree | 737f2309dda93c8a3e895b01feb25ba0e9c349e9 /lib | |
parent | 71db7bd3d3c87a5390a54a409de06d672ca32b98 (diff) | |
download | ruby-10fcca8f153e7d5265bed2a8b42e945f2be7819b.tar.gz |
FileUtils#install: owner/group options
* lib/fileutils.rb (FileUtils#install): add owner and group
options.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55512 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r-- | lib/fileutils.rb | 16 | ||||
-rw-r--r-- | lib/un.rb | 6 |
2 files changed, 19 insertions, 3 deletions
diff --git a/lib/fileutils.rb b/lib/fileutils.rb index a7fca26dbb..d5bda95b58 100644 --- a/lib/fileutils.rb +++ b/lib/fileutils.rb @@ -754,9 +754,20 @@ module FileUtils # FileUtils.install 'ruby', '/usr/local/bin/ruby', :mode => 0755, :verbose => true # FileUtils.install 'lib.rb', '/usr/local/lib/ruby/site_ruby', :verbose => true # - def install(src, dest, mode: nil, preserve: nil, noop: nil, verbose: nil) - fu_output_message "install -c#{preserve && ' -p'}#{mode ? (' -m 0%o' % mode) : ''} #{[src,dest].flatten.join ' '}" if verbose + def install(src, dest, mode: nil, owner: nil, group: nil, preserve: nil, + noop: nil, verbose: nil) + if verbose + msg = +"install -c" + msg << ' -p' if preserve + msg << ' -m 0%o' % mode if mode + msg << " -o #{owner}" if owner + msg << " -g #{group}" if group + msg << ' ' << [src,dest].flatten.join(' ') + fu_output_message msg + end return if noop + uid = fu_get_uid(owner) + gid = fu_get_gid(group) fu_each_src_dest(src, dest) do |s, d| st = File.stat(s) unless File.exist?(d) and compare_file(s, d) @@ -764,6 +775,7 @@ module FileUtils copy_file s, d File.utime st.atime, st.mtime, d if preserve File.chmod mode, d if mode + File.chown uid, gid, d if uid or gid end end end @@ -189,13 +189,17 @@ end # -p apply access/modification times of SOURCE files to # corresponding destination files # -m set permission mode (as in chmod), instead of 0755 +# -o set owner user id, instead of the current owner +# -g set owner group id, instead of the current group # -v verbose # def install - setup("pm:") do |argv, options| + setup("pm:o:g:") do |argv, options| options[:mode] = (mode = options.delete :m) ? mode.oct : 0755 options[:preserve] = true if options.delete :p + (owner = options.delete :o) and options[:owner] = owner + (group = options.delete :g) and options[:group] = group dest = argv.pop argv = argv[0] if argv.size == 1 FileUtils.install argv, dest, options |