v5 v6: bin/sisu, ensure return to start dir

1 files changed, 3 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(/\/$/,'')