aboutsummaryrefslogtreecommitdiffhomepage
path: root/bin
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2010-03-06 09:49:35 -0500
committerRalph Amissah <ralph@amissah.com>2010-03-06 09:49:35 -0500
commitf8c45cd15f95d4d2329046232ec53f0ff13add69 (patch)
tree855d8145e52bdadf7ea684357a6e266a5823b28f /bin
parentsisu.install tidy (diff)
parentintroducing version 2, major patch, (version 1 libraries retained) (diff)
Merge branch 'upstream' into debian/sid
Diffstat (limited to 'bin')
-rw-r--r--bin/sisu5
-rw-r--r--bin/sisu_termsheet5
-rw-r--r--bin/sisu_webrick5
3 files changed, 9 insertions, 6 deletions
diff --git a/bin/sisu b/bin/sisu
index eaced442..d977642f 100644
--- a/bin/sisu
+++ b/bin/sisu
@@ -5,7 +5,8 @@
raise "Please, use Ruby1.8.4 or later, current Ruby #{RUBY_VERSION}" if RUBY_VERSION < '1.8.4'
$VERBOSE=nil
$KCODE='u' if RUBY_VERSION < '1.9'
-SiSU_version_dir='v1'
+argv=$*
+SiSU_version_dir=(argv.inspect=~/--v1/) ? 'v1' : 'v2'
SiSU_lib="sisu/#{SiSU_version_dir}"
require "#{SiSU_lib}/hub"
__END__
@@ -17,7 +18,7 @@ __END__
* Author: Ralph Amissah
* Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009 Ralph Amissah All Rights Reserved.
+ 2007, 2008, 2009, 2010 Ralph Amissah All Rights Reserved.
* License: GPL 3 or later:
diff --git a/bin/sisu_termsheet b/bin/sisu_termsheet
index b70c41ba..15771bae 100644
--- a/bin/sisu_termsheet
+++ b/bin/sisu_termsheet
@@ -4,7 +4,8 @@
raise "Please, use Ruby1.8 (1.8.4 or later), current Ruby #{RUBY_VERSION}" if RUBY_VERSION < '1.8.4' or RUBY_VERSION > '1.9'
#raise "Please, use Ruby1.8.4 or later, current Ruby #{RUBY_VERSION}" if RUBY_VERSION < '1.8.4'
$VERBOSE=nil
-SiSU_version_dir='v1'
+argv=$*
+SiSU_version_dir=(argv.inspect=~/--v1/) ? 'v1' : 'v2'
SiSU_lib="sisu/#{SiSU_version_dir}"
require "#{SiSU_lib}/termsheet"
__END__
@@ -16,7 +17,7 @@ __END__
* Author: Ralph Amissah
* Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009 Ralph Amissah All Rights Reserved.
+ 2007, 2008, 2009, 2010 Ralph Amissah All Rights Reserved.
* License: GPL 3 or later:
diff --git a/bin/sisu_webrick b/bin/sisu_webrick
index df17da57..e0d6e5ca 100644
--- a/bin/sisu_webrick
+++ b/bin/sisu_webrick
@@ -4,7 +4,8 @@
raise "Please, use Ruby1.8 (1.8.4 or later), current Ruby #{RUBY_VERSION}" if RUBY_VERSION < '1.8.4' or RUBY_VERSION > '1.9'
#raise "Please, use Ruby1.8.4 or later, current Ruby #{RUBY_VERSION}" if RUBY_VERSION < '1.8.4'
$VERBOSE=nil
-SiSU_version_dir='v1'
+argv=$*
+SiSU_version_dir=(argv.inspect=~/--v1/) ? 'v1' : 'v2'
SiSU_lib="sisu/#{SiSU_version_dir}"
require "#{SiSU_lib}/webrick"
__END__
@@ -16,7 +17,7 @@ __END__
* Author: Ralph Amissah
* Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2007, 2008, 2009 Ralph Amissah All Rights Reserved.
+ 2007, 2008, 2009, 2010 Ralph Amissah All Rights Reserved.
* License: GPL 3 or later: