aboutsummaryrefslogtreecommitdiffhomepage
path: root/lib/sisu/v4/sysenv.rb
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2013-02-06 21:21:41 -0500
committerRalph Amissah <ralph@amissah.com>2013-02-06 21:21:41 -0500
commit83a88c716a3577de0667f49cce77699790eb3686 (patch)
tree5b42c97a8656e4c7fb5b6e3bdcd568261dd9193d /lib/sisu/v4/sysenv.rb
parentv4: utils, SiSU_Utils::Path.new.base_markup provides base markup directory (diff)
v4: sysenv, webserv dir (output dir), ensure is determined from base markup dir
* where relative path provided (remove possibility of path expansion being done from a language sub-directory), fix
Diffstat (limited to 'lib/sisu/v4/sysenv.rb')
-rw-r--r--lib/sisu/v4/sysenv.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/sisu/v4/sysenv.rb b/lib/sisu/v4/sysenv.rb
index 2ac8897f..728f4fc4 100644
--- a/lib/sisu/v4/sysenv.rb
+++ b/lib/sisu/v4/sysenv.rb
@@ -1941,7 +1941,11 @@ WOK
man_path=if @@man_path.nil?
man_path=if defined? @rc['webserv']['path'] \
and @rc['webserv']['path'] =~/\S\S+/
+ pwd=Dir.pwd
+ Dir.chdir(SiSU_Utils::Path.new.base_markup)
man_path=@@man_path=File.expand_path(@rc['webserv']['path'])
+ Dir.chdir(pwd)
+ man_path
else defaults[:webserv_path]
end
else @@man_path