From 57f00b948ff59e7154df74ad3fac7d93041833b6 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Mon, 12 May 2014 23:09:20 -0400
Subject: v5 v6: bin/sisu, ensure return to start dir

---
 bin/sisu                   | 6 +++---
 data/doc/sisu/CHANGELOG_v5 | 2 ++
 data/doc/sisu/CHANGELOG_v6 | 2 ++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/bin/sisu b/bin/sisu
index ff3cf258..c53438f3 100644
--- a/bin/sisu
+++ b/bin/sisu
@@ -21,7 +21,7 @@ class Orient
     self
   end
   def sisu_called_from_directory
-    Dir.pwd
+    @@sisu_called_from_directory ||= Dir.pwd
   end
   def sisu_run_from
     if processing.called_as == processing.file_full_path \
@@ -221,8 +221,6 @@ class Orient
           Dir.chdir(markup_dir)
           $sisu_document_markup_directory_base_fixed_path=Dir.pwd.gsub(/\/(?:#{language_list.regex})$/,'')
           SiSU::HubMaster.new(argv_sub)
-          Dir.chdir(sisu_called_from_directory)
-          system("cd #{sisu_called_from_directory}")
         elsif markup_dir =~/https?:/
           markup_file.each do |mf|
             (FileTest.file?(mf)) \
@@ -234,6 +232,8 @@ class Orient
           SiSU::HubMaster.new(argv_sub)
         else p "Error directory specified #{markup_dir} not found"
         end
+        Dir.chdir(sisu_called_from_directory)
+        system("cd #{sisu_called_from_directory}")
       end
     else
       $sisu_document_markup_directory=Dir.pwd.gsub(/\/$/,'')
diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5
index 7447e4fc..8126efab 100644
--- a/data/doc/sisu/CHANGELOG_v5
+++ b/data/doc/sisu/CHANGELOG_v5
@@ -38,6 +38,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.3.5.orig.tar.xz
   sisu_5.3.5.orig.tar.xz
   sisu_5.3.5-1.dsc
 
+* sisu, ensure return to start dir
+
 * ao_syntax, address possible manual use of url delimiters「」
 
 * composite, fix includes, provide extra newline after inserted comment
diff --git a/data/doc/sisu/CHANGELOG_v6 b/data/doc/sisu/CHANGELOG_v6
index be37cbe6..1d3a5c6e 100644
--- a/data/doc/sisu/CHANGELOG_v6
+++ b/data/doc/sisu/CHANGELOG_v6
@@ -28,6 +28,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_6.0.5.orig.tar.xz
   sisu_6.0.5.orig.tar.xz
   sisu_6.0.5-1.dsc
 
+* sisu, ensure return to start dir
+
 * ao, document structure check, stop processing on major error
   (with error message & text at location of failure)
 
-- 
cgit v1.2.3