diff options
Diffstat (limited to 'lib/sisu/v2')
| -rw-r--r-- | lib/sisu/v2/param.rb | 12 | ||||
| -rw-r--r-- | lib/sisu/v2/remote.rb | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/lib/sisu/v2/param.rb b/lib/sisu/v2/param.rb index 656490d9..60663830 100644 --- a/lib/sisu/v2/param.rb +++ b/lib/sisu/v2/param.rb @@ -120,9 +120,9 @@ module SiSU_Param def all s=nil if @author - s ||=((@date =~/([12][890]\d{2})/ ) \ - ? ("Copyright (C) #{$1} #{@author}") \ - : ('Copyright (C)' + @author)) #matches years 1800 through 20\d\d 2004w19 + s ||=((@date =~/((?:1[4-9]|2[01])\d{2})/ ) \ + ? ("Copyright (C) #{$1} #{@author}") + : ('Copyright (C)' + @author)) #matches years 1400 through 21\d\d end s end @@ -133,9 +133,9 @@ module SiSU_Param def all s=nil if @author - s ||=((@date =~/([12][890]\d{2})/ ) \ - ? ("Copyright (C) #{$1} #{@author}") \ - : ('Copyright (C)' + @author)) #matches years 1800 through 20\d\d 2004w19 + s ||=((@date =~/((?:1[4-9]|2[01])\d{2})/ ) \ + ? ("Copyright (C) #{$1} #{@author}") + : ('Copyright (C)' + @author)) #matches years 1400 through 21\d\d end s end diff --git a/lib/sisu/v2/remote.rb b/lib/sisu/v2/remote.rb index 32bc336d..d737dad6 100644 --- a/lib/sisu/v2/remote.rb +++ b/lib/sisu/v2/remote.rb @@ -149,7 +149,7 @@ module SiSU_Remote images.sort! @msg,@msgs='downloading images:', [ images.join(',') ] @tell.call.warn unless @opt.cmd =~/q/ - SiSU_Assemble::Remote_image.new.download_images(image_download_url,images) + SiSU_Assemble::Remote_image.new.download_images(image_download_url[0],images) @msg,@msgs='downloading done',nil @tell.call.warn unless @opt.cmd =~/q/ end |