diff options
Diffstat (limited to 'rbuild')
| -rw-r--r-- | rbuild | 34 | 
1 files changed, 14 insertions, 20 deletions
| @@ -29,8 +29,6 @@ raise 'Please, use ruby1.9.3 or later.' if RUBY_VERSION < '1.9.3'       rake -T     [if rant is preferred and installed]       rant -T -   [else [if sisu-install is present]] -     ruby sisu-install -T   SiSU can also be Setup/Installation using:   * Minero Aoki's setup.rb, provided along with SiSU, or @@ -106,7 +104,7 @@ class Project_details    def version      stamp={}      v="#{dir.pwd}/conf/sisu/version.yml" -    version=if File.exist?(v) +    if File.exist?(v)        stamp=YAML::load(File::open(v))        stamp[:version]      else '' @@ -119,7 +117,7 @@ def answer?(ask)    print ask + " ['yes', 'no' or 'quit']: "    resp=File.new('/dev/tty').gets.strip    #resp=gets.strip -  ans=if resp == 'yes'; true +  if resp == 'yes'; true    elsif resp == 'no'; false    elsif resp =~/^quit|exit$/; exit    else puts "[please type: 'yes', 'no' or 'quit']" @@ -129,13 +127,9 @@ end  def default_notice    ans= %{#{@p.rake_rant}    Information on alternative actions is available using: -  [if rake is installed:] -    "rake help" or "rake -T" -  [if rant is installed:] -    "rant help" or "rant -T" -  [else [if sisu-install is present]:] -    "sisu-install help" or "sisu-install -T" -  Default action selected - "install and to setup #{@p.name}" proceed? } +  [if rake (or rant) is installed:] +    "rake help" or "rake -T" (or "rant help" or "rant -T") +  Default action selected - "install #{@p.name}" proceed? }    resp=answer?(ans)    exit unless resp  end @@ -217,23 +211,23 @@ def project_help  Commands quick start list -  #{@p.name} Rake/Rant Help: (This Rakefile or Rantfile uses the same directory structure as setup.rb) +  #{@p.name} Rake/Rant Help: (Rakefile or Rantfile)      rake -T or rant -T          # a task list, (generated by Rake or Rant) for more complete and up to date help      rake system or rant system  # system info used    Quick start install and remove project #{@p.name}     as root:      rake or rant                                # install #{@p.name} +    rake base -    rake setup or rant setup                    # install #{@p.name} (without additonal configuration and generating of test file) +    rake setup                                  # install #{@p.name} (larger install) -    rake install or rant reinstall              # reinstall #{@p.name} +    rake install                                # reinstall #{@p.name} -    rake remove or rant remove                  # clobber/remove #{@p.name}, current version: #{@p.version} -    rake remove_package or rant remove_package  # clobber/remove #{@p.name}, all versions - -For a more detailed and up to date list of command options use +    rake remove                                 # clobber/remove #{@p.name}, current version: #{@p.version} +    rake remove_package                         # clobber/remove #{@p.name}, all versions +For a more detailed and up to date list of command options use:    rake -T    rant -T @@ -242,9 +236,9 @@ end  def tasks    sys('rant -T')  end -                                                           #%% tasks +                                                           #% tasks  desc "rake/rant (as root type 'rake' or 'rant' for default action)" -task :default => [:default_notice,:project] +task :default => [:default_notice,:setup_base]  #task :default => [:help,:notice,:project]  desc "Setup/Install #{@p.name} and try generate a file"  task :project=> [:setup_bin,:setup_lib,:setup_conf,:setup_share,:setup_data,:setup_man,:setup_vim,:post_install_note] | 
