summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Maunz <andreas@maunz.de>2012-08-21 12:13:36 +0200
committerAndreas Maunz <andreas@maunz.de>2012-08-21 12:13:36 +0200
commit7abdddfff98586b8205eb55d9b0865dd17af0975 (patch)
tree6134449fc0b12d61fa9c3238a1dfbaf57a151e1f
parentc568c54d9f5c444812e4050c1b7411648a416286 (diff)
Bugfixesglobruby
-rwxr-xr-xinstall13
1 files changed, 6 insertions, 7 deletions
diff --git a/install b/install
index 48b39fa..9046987 100755
--- a/install
+++ b/install
@@ -41,10 +41,10 @@ echo
[ -f $OT_DEFAULT_CONF ] || (cmd="echo '\$aa = { :uri => nil }' > $OT_DEFAULT_CONF" && run_cmd "$cmd" "Install default.rb to CONFIG (~/.opentox/config)")
-#. ./base-install # Debian specific; disable this for others.
-#./raptor2-install # Download, compile and build raptor2. Install to OT_PREFIX.
-#./rasqal-install # Download, compile and build rasqal. Install to OT_PREFIX.
-#./4store-install # Download, compile and build 4store. Install to OT_PREFIX.
+. ./base-install # Debian specific; disable this for others.
+./raptor2-install # Download, compile and build raptor2. Install to OT_PREFIX.
+./rasqal-install # Download, compile and build rasqal. Install to OT_PREFIX.
+./4store-install # Download, compile and build 4store. Install to OT_PREFIX.
check_utils "git"
if [ ! -d ~/.rbenv ]; then
@@ -63,8 +63,7 @@ fi
# Install global ruby version
-. "$OT_UI_CONF"
-check_utils "rbenv"
-[ "`$RBENV global 2>/dev/null`" = "$RUBY_NUM_VER" ] || (install_ruby global)
+. ./utils.sh
+install_ruby global
notify