summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2014-09-29 01:32:16 +0000
committerRalph Amissah <ralph@amissah.com>2014-09-29 01:32:16 +0000
commita07365736e1887c28745490e0b96f7e387a0941f (patch)
tree70edf24adc206d0128fdb02d07aad5e2125898ee
parentv5 v6: version & changelog (diff)
downloadsisu-a07365736e1887c28745490e0b96f7e387a0941f.zip
sisu-a07365736e1887c28745490e0b96f7e387a0941f.tar.xz
qi (quick installer) minor
-rwxr-xr-xqi9
-rw-r--r--setup/qi_libs_base.rb2
2 files changed, 7 insertions, 4 deletions
diff --git a/qi b/qi
index f5711ea..6bfddf6 100755
--- a/qi
+++ b/qi
@@ -42,8 +42,13 @@ begin
rescue LoadError
puts 'thor (package ruby-thor) not found'
end
-require_relative 'setup/sisu_version' # setup/sisu_version.rb
- include SiSUversion
+begin
+ require './setup/sisu_version' # ./setup/sisu_version.rb
+ include SiSUversion
+rescue LoadError
+ puts 'this does not appear to be a SiSU development directory'
+ exit
+end
require_relative 'setup/qi_libs' # setup/qi_libs.rb
require 'find'
require 'fileutils'
diff --git a/setup/qi_libs_base.rb b/setup/qi_libs_base.rb
index 430ec0c..ec01af1 100644
--- a/setup/qi_libs_base.rb
+++ b/setup/qi_libs_base.rb
@@ -1,6 +1,4 @@
module Project_details
- require_relative 'sisu_version'
- include SiSUversion
def self.name
'SiSU'
end