diff options
| -rw-r--r-- | data/doc/sisu/CHANGELOG_v4 | 3 | ||||
| -rw-r--r-- | lib/sisu/v4/sysenv.rb | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/data/doc/sisu/CHANGELOG_v4 b/data/doc/sisu/CHANGELOG_v4 index 7c085ee8..e035c906 100644 --- a/data/doc/sisu/CHANGELOG_v4 +++ b/data/doc/sisu/CHANGELOG_v4 @@ -31,6 +31,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_4.0.11.orig.tar.xz * v4: bin/sisu, expand given path for sisu executable (where system sisu not called directly) +* v4: sysenv, base images path determined from given path for sisu executable + (where system sisu not called directly) + %% 4.0.10.orig.tar.xz (2013-03-05:09/2) http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.0.10 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.0.10-1 diff --git a/lib/sisu/v4/sysenv.rb b/lib/sisu/v4/sysenv.rb index c3f69c85..f3191be1 100644 --- a/lib/sisu/v4/sysenv.rb +++ b/lib/sisu/v4/sysenv.rb @@ -2145,7 +2145,6 @@ WOK else sisupod_processing_path + '/' + Gt[:doc] end -#p sisup od_processing_path_lng unless FileTest.directory?(sisupod_processing_path_lng) #puts "a processing directory (#{sisupod_processing_path_lng}) is being created for use by sisu" FileUtils::mkdir_p(sisupod_processing_path_lng) @@ -5956,7 +5955,9 @@ WOK cp_images(src,dest) if FileTest.directory?(src) end def cp_base_images #fix images - src="#{@env.path.share}/image" + src=SiSU_path_base \ + ? SiSU_path_base + '/data/sisu/image' + : "#{@env.path.share}/image" dest_arr=[ "#{@env.path.webserv}/_sisu/image_sys", "#{@env.path.webserv}/#{@env.path.stub_pwd}/_sisu/image_sys" |