aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2014-07-07 01:15:17 -0400
committerRalph Amissah <ralph@amissah.com>2014-07-07 01:15:17 -0400
commit4080aa456e59c8ac41892e009c6d356d13cf3f63 (patch)
tree4b34f098244844f4d49b730c9b39323fe98bbcbf
parentv5 v6: version & changelog (& rakefile) (git, ref log instead of shortlog) (diff)
bin/sisu, some cosmetic long line breaking
-rw-r--r--bin/sisu31
-rw-r--r--data/doc/sisu/CHANGELOG_v52
-rw-r--r--data/doc/sisu/CHANGELOG_v62
3 files changed, 25 insertions, 10 deletions
diff --git a/bin/sisu b/bin/sisu
index c53438f3..e6a7645a 100644
--- a/bin/sisu
+++ b/bin/sisu
@@ -28,7 +28,8 @@ class Orient
and File.dirname(processing.file_full_path) != Config::CONFIG['bindir']
:full_path_to_sisu_bin_in_sisu_dir_tree
elsif processing.file_full_path =~/\/gems\// \
- and processing.file_full_path =~/\/sisu-[#{version.stable}#{version.unstable}]\.(?:\d+|[a-z])\.(?:\d+|[a-z])\//
+ and processing.file_full_path \
+ =~ /\/sisu-[#{version.stable}#{version.unstable}]\.(?:\d+|[a-z])\.(?:\d+|[a-z])\//
:gem_install
else
:system_install
@@ -113,11 +114,14 @@ class Orient
end
def paths_set
if sisu_run_from == :system_install \
- and processing.called_as =~ /^#{Config::CONFIG['bindir']}\/sisu[#{version.stable}#{version.unstable}]?$/
+ and processing.called_as \
+ =~ /^#{Config::CONFIG['bindir']}\/sisu[#{version.stable}#{version.unstable}]?$/
:set_path_system
elsif sisu_run_from == :full_path_to_sisu_bin_in_sisu_dir_tree \
- and processing.called_as !~ /^#{Config::CONFIG['bindir']}\/sisu[#{version.stable}#{version.unstable}]?$/ \
- && File.expand_path(processing.called_as) =~/bin\/sisu[#{version.stable}#{version.unstable}]?$/ \
+ and processing.called_as \
+ !~ /^#{Config::CONFIG['bindir']}\/sisu[#{version.stable}#{version.unstable}]?$/ \
+ && File.expand_path(processing.called_as) \
+ =~ /bin\/sisu[#{version.stable}#{version.unstable}]?$/ \
&& FileTest.file?(processing.called_as)
:set_dir_tree_full_path
elsif sisu_run_from==:gem_install
@@ -130,7 +134,8 @@ class Orient
when :set_path_system
Config::CONFIG['datadir'] + '/sisu'
when :set_dir_tree_full_path
- File.expand_path(processing.called_as).sub(/\/bin\/sisu[#{version.stable}#{version.unstable}]?$/,'')
+ File.expand_path(processing.called_as).
+ sub(/\/bin\/sisu[#{version.stable}#{version.unstable}]?$/,'')
when :set_gem_path
Gem::Specification.find_by_name("sisu").gem_dir
else nil
@@ -141,15 +146,18 @@ class Orient
when :set_path_system
Config::CONFIG['datadir'] + '/sisu'
when :set_dir_tree_full_path
- File.expand_path(processing.called_as).sub(/\/bin\/sisu[#{version.stable}#{version.unstable}]?$/,'/data/sisu')
+ File.expand_path(processing.called_as).
+ sub(/\/bin\/sisu[#{version.stable}#{version.unstable}]?$/,'/data/sisu')
when :set_gem_path
Gem::Specification.find_by_name("sisu").gem_dir + '/data/sisu'
else nil
end
end
def sisu_path_specified_lib
- if (processing.called_as !~ /^#{Config::CONFIG['bindir']}\/sisu[#{version.stable}#{version.unstable}]?$/)
- File.expand_path(processing.called_as).sub(/bin\/sisu[#{version.stable}#{version.unstable}]?$/,'lib')
+ if (processing.called_as \
+ !~ /^#{Config::CONFIG['bindir']}\/sisu[#{version.stable}#{version.unstable}]?$/)
+ File.expand_path(processing.called_as).
+ sub(/bin\/sisu[#{version.stable}#{version.unstable}]?$/,'lib')
else nil
end
end
@@ -183,7 +191,9 @@ class Orient
command_line_modifiers << x
elsif x =~/\.ss[tm]/
if x =~/\//
- markup_path,markup_file =(/(\S+\/)((?:#{language_list.regex})?[^\/]+)/).match(x)[1,2]
+ markup_path,markup_file =
+ (/(\S+\/)((?:#{language_list.regex})?[^\/]+)/).
+ match(x)[1,2]
if not processing_files[markup_path]
processing_files[markup_path]=[]
end
@@ -237,7 +247,8 @@ class Orient
end
else
$sisu_document_markup_directory=Dir.pwd.gsub(/\/$/,'')
- $sisu_document_markup_directory_base_fixed_path=Dir.pwd.gsub(/(^|\/)(?:#{language_list.regex})$/,'')
+ $sisu_document_markup_directory_base_fixed_path=
+ Dir.pwd.gsub(/(^|\/)(?:#{language_list.regex})$/,'')
SiSU::HubMaster.new(processing.argv)
end
end
diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5
index 7bd18958..befa92fb 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.4.5.orig.tar.xz
sisu_5.4.5.orig.tar.xz
sisu_5.4.5-1.dsc
+* bin/sisu, some cosmetic long line breaking
+
%% 5.4.4.orig.tar.xz (2014-07-04:26/5)
http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.4.4
http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.4.4-1
diff --git a/data/doc/sisu/CHANGELOG_v6 b/data/doc/sisu/CHANGELOG_v6
index 8f7900d4..c29c6f65 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.11.orig.tar.xz
sisu_6.0.11.orig.tar.xz
sisu_6.0.11-1.dsc
+* bin/sisu, some cosmetic long line breaking
+
%% 6.0.10.orig.tar.xz (2014-07-04:26/5)
http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.0.10
http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.0.10-1