From 9d759c26177474a19442c66fde2e93e0ef7abd00 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Sat, 24 Sep 2011 08:32:19 -0400
Subject: debian/bin/* update checks, sisu2 added

---
 debian/bin/sisu           |  52 ++++++++++++-----
 debian/bin/sisu2          | 146 ++++++++++++++++++++++++++++++++++++++++++++++
 debian/bin/sisu3          |  54 ++++++++++++-----
 debian/bin/sisu_termsheet |  52 ++++++++++++-----
 debian/bin/sisu_webrick   |  52 ++++++++++++-----
 5 files changed, 295 insertions(+), 61 deletions(-)
 create mode 100644 debian/bin/sisu2

diff --git a/debian/bin/sisu b/debian/bin/sisu
index d179579b..bdd71838 100644
--- a/debian/bin/sisu
+++ b/debian/bin/sisu
@@ -2,25 +2,24 @@
 # encoding: utf-8
 #SiSU: copyright (C) 1997 - 2011 Ralph Amissah; License GPL, see appended program information
 begin
-  def check_sisu_stable_ruby_version?
-    rbv_sisu_stable='1.9.2' #'1.8.7'
-    if RUBY_VERSION < rbv_sisu_stable
-      raise "Please, use Ruby#{rbv_sisu_stable} or later, current Ruby #{RUBY_VERSION}"
-    else check_incompatible_ruby_build?
-    end
-  end
-  def check_sisu_dev_ruby_version?
-    rbv_sisu_dev='1.9.2'
-    if RUBY_VERSION < rbv_sisu_dev
-      raise "Please, use Ruby#{rbv_sisu_dev} or later, current Ruby #{RUBY_VERSION}"
+  def ruby_version_ok?(base_version)
+    @v ||=RUBY_VERSION.scan(/\d+/)
+    vb=base_version.scan(/\d+/)
+    if @v[0].to_i <  vb[0].to_i \
+    or @v[0].to_i == vb[0].to_i \
+    && @v[1].to_i <  vb[1].to_i \
+    or @v[0].to_i == vb[0].to_i \
+    && @v[1].to_i == vb[1].to_i \
+    && @v[1].to_i <  vb[2].to_i
+      raise "Please, use Ruby#{vb} or later, current Ruby #{RUBY_VERSION}"
     else check_incompatible_ruby_build?
     end
   end
   def check_incompatible_ruby_build?
     require 'rbconfig'
     e=Config::CONFIG
-    if  RUBY_VERSION == '1.9.2' \
-    and e['PATCHLEVEL'].to_i < 180
+    if RUBY_VERSION == '1.9.2' \
+    && e['PATCHLEVEL'].to_i < 180
       raise <<WOK
 There are known issues with early versions of ruby1.9.2.
 Please, use Ruby 1.9.2p180 or later,
@@ -30,15 +29,27 @@ current version #{e['RUBY_PROGRAM_VERSION']}p#{e['PATCHLEVEL']}
 WOK
     end
   end
+  def check_sisu_legacy_ruby_version?
+    rbv_sisu_legacy='1.9.2' #'1.8.7'
+    ruby_version_ok?(rbv_sisu_legacy)
+  end
+  def check_sisu_stable_ruby_version?
+    rbv_sisu_stable='1.9.2'
+    ruby_version_ok?(rbv_sisu_stable)
+  end
+  def check_sisu_dev_ruby_version?
+    rbv_sisu_dev='1.9.2'
+    ruby_version_ok?(rbv_sisu_dev)
+  end
   $VERBOSE=nil
   $KCODE='u' if RUBY_VERSION < '1.9'
   argv=$*
   SiSU_version_dir=case argv.inspect
   when /--v2/
-    check_sisu_stable_ruby_version?
+    check_sisu_legacy_ruby_version?
     'v2'
   when /--v3/
-    check_sisu_dev_ruby_version?
+    check_sisu_stable_ruby_version?
     'v3'
   when /--dev/
     check_sisu_dev_ruby_version?
@@ -67,6 +78,17 @@ rescue
     system RUBYPATH: ${RUBYPATH}
     system RUBYLIB: ${RUBYLIB}
   "})
+  puts %{
+    On a Debian system the following system commands may help set the default version of ruby to 1.9.2:
+      sudo update-alternatives --verbose --set ruby /usr/bin/ruby1.9.1
+      export RUBYPATH='/usr/local/bin:/usr/bin'
+      export RUBYLIB='/usr/local/lib/site_ruby/1.9.1:/usr/lib/ruby/1.9.1:/usr/local/lib/site_ruby/1.8:/usr/lib/ruby/1.8'
+
+    To return to ruby 1.8 (not suitable for sisu):
+      sudo update-alternatives --verbose --set ruby /usr/bin/ruby1.8
+      export RUBYPATH='/usr/local/bin'
+      export RUBYLIB='/usr/local/lib/site_ruby/1.8:/usr/lib/ruby/1.8:/usr/local/lib/site_ruby/1.9.1:/usr/lib/ruby/1.9.1'
+  }
 end
 __END__
 
diff --git a/debian/bin/sisu2 b/debian/bin/sisu2
new file mode 100644
index 00000000..473c18ce
--- /dev/null
+++ b/debian/bin/sisu2
@@ -0,0 +1,146 @@
+#! /usr/bin/ruby1.9.1
+# encoding: utf-8
+#SiSU: copyright (C) 1997 - 2011 Ralph Amissah; License GPL, see appended program information
+begin
+  def ruby_version_ok?(base_version)
+    @v ||=RUBY_VERSION.scan(/\d+/)
+    vb=base_version.scan(/\d+/)
+    if @v[0].to_i <  vb[0].to_i \
+    or @v[0].to_i == vb[0].to_i \
+    && @v[1].to_i <  vb[1].to_i \
+    or @v[0].to_i == vb[0].to_i \
+    && @v[1].to_i == vb[1].to_i \
+    && @v[1].to_i <  vb[2].to_i
+      raise "Please, use Ruby#{vb} or later, current Ruby #{RUBY_VERSION}"
+    else check_incompatible_ruby_build?
+    end
+  end
+  def check_incompatible_ruby_build?
+    require 'rbconfig'
+    e=Config::CONFIG
+    if RUBY_VERSION == '1.9.2' \
+    && e['PATCHLEVEL'].to_i < 180
+      raise <<WOK
+There are known issues with early versions of ruby1.9.2.
+Please, use Ruby 1.9.2p180 or later,
+current version #{e['RUBY_PROGRAM_VERSION']}p#{e['PATCHLEVEL']}
+#{%x{ruby -v}.strip.to_s}
+
+WOK
+    end
+  end
+  def check_sisu_legacy_ruby_version?
+    rbv_sisu_legacy='1.9.2' #'1.8.7'
+    ruby_version_ok?(rbv_sisu_legacy)
+  end
+  def check_sisu_stable_ruby_version?
+    rbv_sisu_stable='1.9.2'
+    ruby_version_ok?(rbv_sisu_stable)
+  end
+  def check_sisu_dev_ruby_version?
+    rbv_sisu_dev='1.9.2'
+    ruby_version_ok?(rbv_sisu_dev)
+  end
+  $VERBOSE=nil
+  $KCODE='u' if RUBY_VERSION < '1.9'
+  argv=$*
+  SiSU_version_dir=case argv.inspect
+  when /--v2/
+    check_sisu_legacy_ruby_version?
+    'v2'
+  when /--v3/
+    check_sisu_stable_ruby_version?
+    'v3'
+  when /--dev/
+    check_sisu_dev_ruby_version?
+    'v3'
+  else
+    check_sisu_stable_ruby_version?
+    'v3'
+  end
+  SiSU_lib="sisu/#{SiSU_version_dir}"
+  require "#{SiSU_lib}/hub"
+rescue
+  STDERR.puts 'ERROR'
+  STDERR.puts $!
+  STDERR.puts $@
+  require 'rbconfig'
+  e=Config::CONFIG
+  puts %{
+                   #{%x{ruby -v}.strip.to_s}
+                   #{RUBY_VERSION}
+    ruby version:  #{e['RUBY_PROGRAM_VERSION']}p#{e['PATCHLEVEL']}
+    ruby named:    #{e['ruby_version']}
+    rubylib:       #{e['rubylibdir']}
+    rubylib local: #{e['sitelibdir']}
+  }
+  system(%{echo "
+    system RUBYPATH: ${RUBYPATH}
+    system RUBYLIB: ${RUBYLIB}
+  "})
+  puts %{
+    On a Debian system the following system commands may help set the default version of ruby to 1.9.2:
+      sudo update-alternatives --verbose --set ruby /usr/bin/ruby1.9.1
+      export RUBYPATH='/usr/local/bin:/usr/bin'
+      export RUBYLIB='/usr/local/lib/site_ruby/1.9.1:/usr/lib/ruby/1.9.1:/usr/local/lib/site_ruby/1.8:/usr/lib/ruby/1.8'
+
+    To return to ruby 1.8 (not suitable for sisu):
+      sudo update-alternatives --verbose --set ruby /usr/bin/ruby1.8
+      export RUBYPATH='/usr/local/bin'
+      export RUBYLIB='/usr/local/lib/site_ruby/1.8:/usr/lib/ruby/1.8:/usr/local/lib/site_ruby/1.9.1:/usr/lib/ruby/1.9.1'
+  }
+end
+__END__
+
+ * Name: SiSU
+
+ * Description: a framework for document structuring, publishing and search
+
+ * Author: Ralph Amissah
+
+ * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+   2007, 2008, 2009, 2010, 2011 Ralph Amissah All Rights Reserved.
+
+ * License: GPL 3 or later:
+
+   SiSU, a framework for document structuring, publishing and search
+
+   Copyright (C) Ralph Amissah
+
+   This program is free software: you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by the Free
+   Software Foundation, either version 3 of the License, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful, but WITHOUT
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+   more details.
+
+   You should have received a copy of the GNU General Public License along with
+   this program. If not, see <http://www.gnu.org/licenses/>.
+
+   If you have Internet connection, the latest version of the GPL should be
+   available at these locations:
+   <http://www.fsf.org/licensing/licenses/gpl.html>
+   <http://www.gnu.org/licenses/gpl.html>
+
+   <http://www.jus.uio.no/sisu/gpl.fsf/toc.html>
+   <http://www.jus.uio.no/sisu/gpl.fsf/doc.html>
+   <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt>
+
+ * SiSU uses:
+   * Standard SiSU markup syntax,
+   * Standard SiSU meta-markup syntax, and the
+   * Standard SiSU object citation numbering and system
+
+ * Hompages:
+   <http://www.jus.uio.no/sisu>
+   <http://www.sisudoc.org>
+
+ * Download:
+   <http://www.jus.uio.no/sisu/SiSU/download.html>
+
+ * Ralph Amissah
+   <ralph@amissah.com>
+   <ralph.amissah@gmail.com>
diff --git a/debian/bin/sisu3 b/debian/bin/sisu3
index 66e57f11..473c18ce 100644
--- a/debian/bin/sisu3
+++ b/debian/bin/sisu3
@@ -2,25 +2,24 @@
 # encoding: utf-8
 #SiSU: copyright (C) 1997 - 2011 Ralph Amissah; License GPL, see appended program information
 begin
-  def check_sisu_stable_ruby_version?
-    rbv_sisu_stable='1.9.2' #'1.8.7'
-    if RUBY_VERSION < rbv_sisu_stable
-      raise "Please, use Ruby#{rbv_sisu_stable} or later, current Ruby #{RUBY_VERSION}"
-    else check_incompatible_ruby_build?
-    end
-  end
-  def check_sisu_dev_ruby_version?
-    rbv_sisu_dev='1.9.2'
-    if RUBY_VERSION < rbv_sisu_dev
-      raise "Please, use Ruby#{rbv_sisu_dev} or later, current Ruby #{RUBY_VERSION}"
+  def ruby_version_ok?(base_version)
+    @v ||=RUBY_VERSION.scan(/\d+/)
+    vb=base_version.scan(/\d+/)
+    if @v[0].to_i <  vb[0].to_i \
+    or @v[0].to_i == vb[0].to_i \
+    && @v[1].to_i <  vb[1].to_i \
+    or @v[0].to_i == vb[0].to_i \
+    && @v[1].to_i == vb[1].to_i \
+    && @v[1].to_i <  vb[2].to_i
+      raise "Please, use Ruby#{vb} or later, current Ruby #{RUBY_VERSION}"
     else check_incompatible_ruby_build?
     end
   end
   def check_incompatible_ruby_build?
     require 'rbconfig'
     e=Config::CONFIG
-    if  RUBY_VERSION == '1.9.2' \
-    and e['PATCHLEVEL'].to_i < 180
+    if RUBY_VERSION == '1.9.2' \
+    && e['PATCHLEVEL'].to_i < 180
       raise <<WOK
 There are known issues with early versions of ruby1.9.2.
 Please, use Ruby 1.9.2p180 or later,
@@ -30,21 +29,33 @@ current version #{e['RUBY_PROGRAM_VERSION']}p#{e['PATCHLEVEL']}
 WOK
     end
   end
+  def check_sisu_legacy_ruby_version?
+    rbv_sisu_legacy='1.9.2' #'1.8.7'
+    ruby_version_ok?(rbv_sisu_legacy)
+  end
+  def check_sisu_stable_ruby_version?
+    rbv_sisu_stable='1.9.2'
+    ruby_version_ok?(rbv_sisu_stable)
+  end
+  def check_sisu_dev_ruby_version?
+    rbv_sisu_dev='1.9.2'
+    ruby_version_ok?(rbv_sisu_dev)
+  end
   $VERBOSE=nil
   $KCODE='u' if RUBY_VERSION < '1.9'
   argv=$*
   SiSU_version_dir=case argv.inspect
   when /--v2/
-    check_sisu_stable_ruby_version?
+    check_sisu_legacy_ruby_version?
     'v2'
   when /--v3/
-    check_sisu_dev_ruby_version?
+    check_sisu_stable_ruby_version?
     'v3'
   when /--dev/
     check_sisu_dev_ruby_version?
     'v3'
   else
-    check_sisu_dev_ruby_version?
+    check_sisu_stable_ruby_version?
     'v3'
   end
   SiSU_lib="sisu/#{SiSU_version_dir}"
@@ -67,6 +78,17 @@ rescue
     system RUBYPATH: ${RUBYPATH}
     system RUBYLIB: ${RUBYLIB}
   "})
+  puts %{
+    On a Debian system the following system commands may help set the default version of ruby to 1.9.2:
+      sudo update-alternatives --verbose --set ruby /usr/bin/ruby1.9.1
+      export RUBYPATH='/usr/local/bin:/usr/bin'
+      export RUBYLIB='/usr/local/lib/site_ruby/1.9.1:/usr/lib/ruby/1.9.1:/usr/local/lib/site_ruby/1.8:/usr/lib/ruby/1.8'
+
+    To return to ruby 1.8 (not suitable for sisu):
+      sudo update-alternatives --verbose --set ruby /usr/bin/ruby1.8
+      export RUBYPATH='/usr/local/bin'
+      export RUBYLIB='/usr/local/lib/site_ruby/1.8:/usr/lib/ruby/1.8:/usr/local/lib/site_ruby/1.9.1:/usr/lib/ruby/1.9.1'
+  }
 end
 __END__
 
diff --git a/debian/bin/sisu_termsheet b/debian/bin/sisu_termsheet
index 512a2f2e..58f844c6 100644
--- a/debian/bin/sisu_termsheet
+++ b/debian/bin/sisu_termsheet
@@ -2,25 +2,24 @@
 # encoding: utf-8
 #SiSU: copyright (C) 1997 - 2011 Ralph Amissah; License GPL, see appended program information
 begin
-  def check_sisu_stable_ruby_version?
-    rbv_sisu_stable='1.9.2' #'1.8.7'
-    if RUBY_VERSION < rbv_sisu_stable
-      raise "Please, use Ruby#{rbv_sisu_stable} or later, current Ruby #{RUBY_VERSION}"
-    else check_incompatible_ruby_build?
-    end
-  end
-  def check_sisu_dev_ruby_version?
-    rbv_sisu_dev='1.9.2'
-    if RUBY_VERSION < rbv_sisu_dev
-      raise "Please, use Ruby#{rbv_sisu_dev} or later, current Ruby #{RUBY_VERSION}"
+  def ruby_version_ok?(base_version)
+    @v ||=RUBY_VERSION.scan(/\d+/)
+    vb=base_version.scan(/\d+/)
+    if @v[0].to_i <  vb[0].to_i \
+    or @v[0].to_i == vb[0].to_i \
+    && @v[1].to_i <  vb[1].to_i \
+    or @v[0].to_i == vb[0].to_i \
+    && @v[1].to_i == vb[1].to_i \
+    && @v[1].to_i <  vb[2].to_i
+      raise "Please, use Ruby#{vb} or later, current Ruby #{RUBY_VERSION}"
     else check_incompatible_ruby_build?
     end
   end
   def check_incompatible_ruby_build?
     require 'rbconfig'
     e=Config::CONFIG
-    if  RUBY_VERSION == '1.9.2' \
-    and e['PATCHLEVEL'].to_i < 180
+    if RUBY_VERSION == '1.9.2' \
+    && e['PATCHLEVEL'].to_i < 180
       raise <<WOK
 There are known issues with early versions of ruby1.9.2.
 Please, use Ruby 1.9.2p180 or later,
@@ -30,14 +29,26 @@ current version #{e['RUBY_PROGRAM_VERSION']}p#{e['PATCHLEVEL']}
 WOK
     end
   end
+  def check_sisu_legacy_ruby_version?
+    rbv_sisu_legacy='1.9.2' #'1.8.7'
+    ruby_version_ok?(rbv_sisu_legacy)
+  end
+  def check_sisu_stable_ruby_version?
+    rbv_sisu_stable='1.9.2'
+    ruby_version_ok?(rbv_sisu_stable)
+  end
+  def check_sisu_dev_ruby_version?
+    rbv_sisu_dev='1.9.2'
+    ruby_version_ok?(rbv_sisu_dev)
+  end
   $VERBOSE=nil
   argv=$*
   SiSU_version_dir=case argv.inspect
   when /--v2/
-    check_sisu_stable_ruby_version?
+    check_sisu_legacy_ruby_version?
     'v2'
   when /--v3/
-    check_sisu_dev_ruby_version?
+    check_sisu_stable_ruby_version?
     'v3'
   when /--dev/
     check_sisu_dev_ruby_version?
@@ -66,6 +77,17 @@ rescue
     system RUBYPATH: ${RUBYPATH}
     system RUBYLIB: ${RUBYLIB}
   "})
+  puts %{
+    On a Debian system the following system commands may help set the default version of ruby to 1.9.2:
+      sudo update-alternatives --verbose --set ruby /usr/bin/ruby1.9.1
+      export RUBYPATH='/usr/local/bin:/usr/bin'
+      export RUBYLIB='/usr/local/lib/site_ruby/1.9.1:/usr/lib/ruby/1.9.1:/usr/local/lib/site_ruby/1.8:/usr/lib/ruby/1.8'
+
+    To return to ruby 1.8 (not suitable for sisu):
+      sudo update-alternatives --verbose --set ruby /usr/bin/ruby1.8
+      export RUBYPATH='/usr/local/bin'
+      export RUBYLIB='/usr/local/lib/site_ruby/1.8:/usr/lib/ruby/1.8:/usr/local/lib/site_ruby/1.9.1:/usr/lib/ruby/1.9.1'
+  }
 end
 __END__
 
diff --git a/debian/bin/sisu_webrick b/debian/bin/sisu_webrick
index e5708911..3283d228 100644
--- a/debian/bin/sisu_webrick
+++ b/debian/bin/sisu_webrick
@@ -2,25 +2,24 @@
 # encoding: utf-8
 #SiSU: copyright (C) 1997 - 2011 Ralph Amissah; License GPL, see appended program information
 begin
-  def check_sisu_stable_ruby_version?
-    rbv_sisu_stable='1.9.2' #'1.8.7'
-    if RUBY_VERSION < rbv_sisu_stable
-      raise "Please, use Ruby#{rbv_sisu_stable} or later, current Ruby #{RUBY_VERSION}"
-    else check_incompatible_ruby_build?
-    end
-  end
-  def check_sisu_dev_ruby_version?
-    rbv_sisu_dev='1.9.2'
-    if RUBY_VERSION < rbv_sisu_dev
-      raise "Please, use Ruby#{rbv_sisu_dev} or later, current Ruby #{RUBY_VERSION}"
+  def ruby_version_ok?(base_version)
+    @v ||=RUBY_VERSION.scan(/\d+/)
+    vb=base_version.scan(/\d+/)
+    if @v[0].to_i <  vb[0].to_i \
+    or @v[0].to_i == vb[0].to_i \
+    && @v[1].to_i <  vb[1].to_i \
+    or @v[0].to_i == vb[0].to_i \
+    && @v[1].to_i == vb[1].to_i \
+    && @v[1].to_i <  vb[2].to_i
+      raise "Please, use Ruby#{vb} or later, current Ruby #{RUBY_VERSION}"
     else check_incompatible_ruby_build?
     end
   end
   def check_incompatible_ruby_build?
     require 'rbconfig'
     e=Config::CONFIG
-    if  RUBY_VERSION == '1.9.2' \
-    and e['PATCHLEVEL'].to_i < 180
+    if RUBY_VERSION == '1.9.2' \
+    && e['PATCHLEVEL'].to_i < 180
       raise <<WOK
 There are known issues with early versions of ruby1.9.2.
 Please, use Ruby 1.9.2p180 or later,
@@ -30,14 +29,26 @@ current version #{e['RUBY_PROGRAM_VERSION']}p#{e['PATCHLEVEL']}
 WOK
     end
   end
+  def check_sisu_legacy_ruby_version?
+    rbv_sisu_legacy='1.9.2' #'1.8.7'
+    ruby_version_ok?(rbv_sisu_legacy)
+  end
+  def check_sisu_stable_ruby_version?
+    rbv_sisu_stable='1.9.2'
+    ruby_version_ok?(rbv_sisu_stable)
+  end
+  def check_sisu_dev_ruby_version?
+    rbv_sisu_dev='1.9.2'
+    ruby_version_ok?(rbv_sisu_dev)
+  end
   $VERBOSE=nil
   argv=$*
   SiSU_version_dir=case argv.inspect
   when /--v2/
-    check_sisu_stable_ruby_version?
+    check_sisu_legacy_ruby_version?
     'v2'
   when /--v3/
-    check_sisu_dev_ruby_version?
+    check_sisu_stable_ruby_version?
     'v3'
   when /--dev/
     check_sisu_dev_ruby_version?
@@ -66,6 +77,17 @@ rescue
     system RUBYPATH: ${RUBYPATH}
     system RUBYLIB: ${RUBYLIB}
   "})
+  puts %{
+    On a Debian system the following system commands may help set the default version of ruby to 1.9.2:
+      sudo update-alternatives --verbose --set ruby /usr/bin/ruby1.9.1
+      export RUBYPATH='/usr/local/bin:/usr/bin'
+      export RUBYLIB='/usr/local/lib/site_ruby/1.9.1:/usr/lib/ruby/1.9.1:/usr/local/lib/site_ruby/1.8:/usr/lib/ruby/1.8'
+
+    To return to ruby 1.8 (not suitable for sisu):
+      sudo update-alternatives --verbose --set ruby /usr/bin/ruby1.8
+      export RUBYPATH='/usr/local/bin'
+      export RUBYLIB='/usr/local/lib/site_ruby/1.8:/usr/lib/ruby/1.8:/usr/local/lib/site_ruby/1.9.1:/usr/lib/ruby/1.9.1'
+  }
 end
 __END__
 
-- 
cgit v1.2.3