diff options
| author | eban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-10-02 10:36:34 +0000 |
|---|---|---|
| committer | eban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-10-02 10:36:34 +0000 |
| commit | d902111a57dfcf3c9b017b0ebd1b49f19142168c (patch) | |
| tree | e89854471aba5e2c90da990b9779e6bfeacc9863 /lib/ftools.rb | |
| parent | 75eee0bafdaa5adf30dc87cbb01b5f2e24ac8a01 (diff) | |
| download | ruby-d902111a57dfcf3c9b017b0ebd1b49f19142168c.tar.gz | |
* lib/ftools.rb (catname): allow trailing '/' for the destination.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1763 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/ftools.rb')
| -rw-r--r-- | lib/ftools.rb | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/lib/ftools.rb b/lib/ftools.rb index 5e6203b1a3..4047a595eb 100644 --- a/lib/ftools.rb +++ b/lib/ftools.rb @@ -4,12 +4,7 @@ class << File def catname from, to if FileTest.directory? to - to + - if to =~ /\\/ - if to[-1,1] != '\\' then '\\' end + basename(from) - else - if to[-1,1] != '/' then '/' end + basename(from) - end + File.join to.sub(%r([/\\]$), ''), basename(from) else to end |