aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2013-02-08 21:47:23 -0500
committerRalph Amissah <ralph@amissah.com>2013-02-08 21:47:28 -0500
commitc199fab44a0d8c16f4b79ddaaae7ce2f448bc91c (patch)
treef29ea45a94919e399efac80d2e682e7c9bda2edd
parentdebian/changelog (4.0.6-1) (diff)
debian/bin/sisu to match bin/sisu, only ruby shebang should differ, fix
* [this should fix errant behavior of code spotted and reported by chals to sisu@lists.sisudoc.org <http://lists.sisudoc.org/pipermail/sisu/2013-February/000569.html>]
-rw-r--r--debian/bin/sisu6
1 files changed, 4 insertions, 2 deletions
diff --git a/debian/bin/sisu b/debian/bin/sisu
index fcf866a8..6a8e9d1c 100644
--- a/debian/bin/sisu
+++ b/debian/bin/sisu
@@ -1,6 +1,6 @@
#! /usr/bin/ruby1.9.1
# encoding: utf-8
-#SiSU: copyright (C) 1997 - 2012 Ralph Amissah; License GPL, see appended program information
+#SiSU: copyright (C) 1997 - 2013 Ralph Amissah; License GPL, see appended program information
begin
def ruby_version_ok?(base_version)
@v ||=RUBY_VERSION.scan(/\d+/)
@@ -138,6 +138,7 @@ WOK
if FileTest.directory?(markup_dir)
system("cd #{markup_dir}")
Dir.chdir(markup_dir)
+ $sisu_document_markup_directory_base_fixed_path=Dir.pwd.gsub(/\/(?:#{lng_lst_rgx})$/,'')
SiSU::HubMaster.new(argv_sub)
Dir.chdir(SiSU_called_from_directory)
system("cd #{SiSU_called_from_directory}")
@@ -146,6 +147,7 @@ WOK
end
else
$sisu_document_markup_directory=Dir.pwd.gsub(/\/$/,'')
+ $sisu_document_markup_directory_base_fixed_path=Dir.pwd.gsub(/(^|\/)(?:#{lng_lst_rgx})$/,'')
SiSU::HubMaster.new(argv)
end
rescue
@@ -176,7 +178,7 @@ __END__
* Author: Ralph Amissah
* Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010, 2011, 2012 Ralph Amissah, All Rights Reserved.
+ 2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
* License: GPL 3 or later: