aboutsummaryrefslogtreecommitdiffhomepage
path: root/lib/sisu/v3/remote.rb
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2011-09-05 11:04:42 -0400
committerRalph Amissah <ralph@amissah.com>2011-09-05 11:08:50 -0400
commit22f6ac004b2b86d8554ddbc5650aa3f11d348d90 (patch)
tree1d25a04955e2915b89a306bbccc7b3bd57f8e994 /lib/sisu/v3/remote.rb
parentv3: Dir.chdir, remove "system cd" (change directory) use Dir.chdir (diff)
v3: sisupod_v3 make (build); place (rsync); process (generate sisu output from)sisu_3.0.17sisu-3.0.17
* sisupod v3 * modify pod dir structure, place sisu source in dir/[lang_code]/ e.g. dir/en/ * use tar.xz (.txz) * bundle all language version in pod * bundle .ssm and all included files for each selected language (rather than composited .ssm.sst file) (filename pattern) or named in files to be processed string * remote placement * sisu processing from sisupod v3 * rsync sisupod v3 * sysenv, check that tree is available and use as desired when available
Diffstat (limited to 'lib/sisu/v3/remote.rb')
-rw-r--r--lib/sisu/v3/remote.rb7
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/sisu/v3/remote.rb b/lib/sisu/v3/remote.rb
index 5537d7b4..bda7529b 100644
--- a/lib/sisu/v3/remote.rb
+++ b/lib/sisu/v3/remote.rb
@@ -165,7 +165,6 @@ module SiSU_Remote
require 'net/http'
for requested_pod in get_p
pod_info=Remote_download.new(requested_pod)
- @opt.fns=pod_info.pod.name
Net::HTTP.start(pod_info.pod.site) do |http|
resp=http.get("#{pod_info.pod.path}/#{pod_info.pod.name_source}")
open(pod_info.pod.name,'wb') do |file|
@@ -181,12 +180,12 @@ module SiSU_Remote
@requested_file=requested_file
end
def pod
- re_p_div=/https?:\/\/([^\/]+)(\/\S+)\/(sisupod(?:\.zip)?|\S+?(?:\.ss[mt]\.zip)?|[^\/]+?\.ssp)$/
- re_p=/(sisupod(?:\.zip)?|\S+?\.ss[mt](?:\.zip)?|[^\/]+?\.ssp)$/
+ re_p_div=/https?:\/\/([^\/]+)(\/\S+)\/(sisupod(?:\.txz)?|\S+?(?:\.ss[mt]\.txz)?|[^\/]+?\.ssp)$/
+ re_p=/(sisupod(?:\.txz)?|\S+?\.ss[mt](?:\.txz)?|[^\/]+?\.ssp)$/
if @requested_file =~ re_p_div
@site,@pth,@pod= re_p_div.match(@requested_file).captures
elsif @requested_file =~ re_p
- @pod= re_p.match(@requested_file).captures
+ @pod=re_p.match(@requested_file).captures.join
end
def site
@site