diff options
| author | Ralph Amissah <ralph@amissah.com> | 2011-06-09 22:05:51 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2011-06-09 22:05:54 -0400 |
| commit | d0fd14adeb55b4dfffed43c413207b2328c654dd (patch) | |
| tree | f95c8ee00a703c327962166cc907c57d8af2c701 /lib/sisu | |
| parent | v3: param, remove unused class variable '@@symlnk' (diff) | |
v3: sysenv, limit/prevent the creation of spurious language output directories
Diffstat (limited to 'lib/sisu')
| -rw-r--r-- | lib/sisu/v3/embedded.rb | 4 | ||||
| -rw-r--r-- | lib/sisu/v3/sysenv.rb | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/lib/sisu/v3/embedded.rb b/lib/sisu/v3/embedded.rb index fad1fb29..fb2245c9 100644 --- a/lib/sisu/v3/embedded.rb +++ b/lib/sisu/v3/embedded.rb @@ -87,8 +87,8 @@ module SiSU_Embedded def images src="#{@base_src_dir}/_sisu/image" src_img='_sisu/image' - ldest="#{@env.path.webserv}/#{@env.path.stub_pwd}" - img_dir="#{@env.path.webserv}/#{@env.path.stub_pwd}/_sisu/image" + ldest=@env.path.output + img_dir="#{@env.path.output}/_sisu/image" @rhost.each do |remote_conn| rdest="#{remote_conn[:name]}/#{@env.path.stub_pwd}/_sisu/image" remote_rel=remote_conn[:name] + '/' + @f.output_path.stub.rcp diff --git a/lib/sisu/v3/sysenv.rb b/lib/sisu/v3/sysenv.rb index 944df010..d0c88deb 100644 --- a/lib/sisu/v3/sysenv.rb +++ b/lib/sisu/v3/sysenv.rb @@ -1642,7 +1642,10 @@ WOK "#{path.webserv}/#{images}" end def output #web/webserv output directory... subdirectory into which further subdirectories are made based on file names - "#{path.webserv}/#{@stub_pwd}" + r=Px[:lng_lst].join('|') + u=/.+?\/([^\/]+)(?:\/(?:#{r})$|$)/ + base_stub=@sys.pwd.gsub(u,'\1') + "#{path.webserv}/#{base_stub}" end def feed (defined? @rc['webserv']['feed']) \ |