From e87bf6da34afbfd286d84df18a4d680c5df5ea53 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Fri, 17 Jan 2014 21:59:05 -0500 Subject: debian/sisu.install use vendor_ruby; use bin/sisu (remove debian/bin/sisu) --- debian/bin/sisu | 232 ---------------------------------------------------- debian/sisu.install | 4 +- 2 files changed, 2 insertions(+), 234 deletions(-) delete mode 100644 debian/bin/sisu diff --git a/debian/bin/sisu b/debian/bin/sisu deleted file mode 100644 index 8df1ae88..00000000 --- a/debian/bin/sisu +++ /dev/null @@ -1,232 +0,0 @@ -#! /usr/bin/ruby1.9.1 -# encoding: utf-8 -#SiSU: copyright (C) 1997 - 2014 Ralph Amissah; License GPL 3, 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 < 0 - argv_sub_files.each_pair do |markup_dir,markup_file| - $sisu_document_markup_directory=markup_dir.gsub(/\/$/,'') - argv_sub=argv_sub_mods + markup_file - if FileTest.directory?(markup_dir) - system("cd #{markup_dir}") - Dir.chdir(markup_dir) - $sisu_document_markup_directory_base_fixed_path=Dir.pwd.gsub(/\/(?:#{lng_lst_rgx})$/,'') - 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)) \ - ? (puts 'requested remote file already exists in current directory ' + Dir.pwd + ' using ' + mf) - : (system("wget #{markup_dir}/#{mf}")) - end - $sisu_document_markup_directory_base_fixed_path=Dir.pwd.gsub(/\/(?:#{lng_lst_rgx})$/,'') - argv_sub=argv_sub_mods + markup_file - SiSU::HubMaster.new(argv_sub) - else p "Error directory specified #{markup_dir} not found" - end - end - else - $sisu_document_markup_directory=Dir.pwd.gsub(/\/$/,'') - $sisu_document_markup_directory_base_fixed_path=Dir.pwd.gsub(/(^|\/)(?:#{lng_lst_rgx})$/,'') - SiSU::HubMaster.new(argv) - end -rescue - STDERR.puts 'ERROR' - STDERR.puts $! - STDERR.puts $@ - require 'rbconfig' - require 'rubygems' - 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']} - gem dir: #{Gem.dir} - gem path: #{Gem.path} - } - system(%{echo " - system RUBYPATH: ${RUBYPATH} - system RUBYLIB: ${RUBYLIB} - "}) -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, 2012, 2013, 2014 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 . - - If you have Internet connection, the latest version of the GPL should be - available at these locations: - - - - - - * SiSU uses: - * Standard SiSU markup syntax, - * Standard SiSU meta-markup syntax, and the - * Standard SiSU object citation numbering and system - - * Hompages: - - - - * Download: - - - * Git - - - - - * Ralph Amissah - - diff --git a/debian/sisu.install b/debian/sisu.install index f6564395..720d2bbf 100644 --- a/debian/sisu.install +++ b/debian/sisu.install @@ -1,4 +1,4 @@ -debian/bin/sisu usr/bin +bin/sisu usr/bin bin/sisu4 usr/bin bin/sisu5 usr/bin bin/sisu-concordance usr/bin @@ -8,7 +8,7 @@ bin/sisu-html* usr/bin bin/sisu-odf usr/bin bin/sisu-txt usr/bin bin/sisu-webrick usr/bin -lib/sisu usr/lib/ruby/1.9.1 +lib/sisu usr/lib/ruby/vendor_ruby conf/sisu etc data/sisu usr/share data/doc/sisu usr/share/doc -- cgit v1.2.3