summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorAndreas Maunz <andreas@maunz.de>2012-07-17 08:15:34 +0200
committerAndreas Maunz <andreas@maunz.de>2012-07-17 08:15:34 +0200
commitbfde91ac1a4c4d663dc326509fc6ac87f6996c4c (patch)
tree730bb5a14331f11820f8c23371b16aed730d6704 /bin
parent080a09b9bb468f0fb868ac69fcf49d4dc0c31857 (diff)
Updated installer
Diffstat (limited to 'bin')
-rwxr-xr-xbin/algorithm-install9
-rwxr-xr-xbin/fminer-install2
2 files changed, 9 insertions, 2 deletions
diff --git a/bin/algorithm-install b/bin/algorithm-install
index af65d97..07ef24a 100755
--- a/bin/algorithm-install
+++ b/bin/algorithm-install
@@ -7,7 +7,7 @@ SELF=$(basename $0 -install)
[ "`id -u`" = "0" ] && echo "This script must be run as non-root." 1>&2 && exit 1
# Adjust ruby version here!
-RUBY_NUM_VER="1.9.3-p125"
+RUBY_NUM_VER="1.9.3-p194"
echo
echo "Welcome to service installation (<Return> to continue)."
@@ -45,12 +45,19 @@ fi
# log directory for this service
[ -d $OT_CONFIG_DIR/config/$SELF ] || cmd="mkdir -p $OT_CONFIG_DIR/config/$SELF" && run_cmd "$cmd" "Config directory"
+# ruby
[ "`$RBENV local 2>/dev/null`" = "$RUBY_NUM_VER" ] || install_ruby
+
+# fminer
( [ -n "`$FIND libfminer/ -name bbrc.so 2>/dev/null`" ] && [ -n "`$FIND libfminer/ -name last.so 2>/dev/null`" ] ) || . ./bin/fminer-install
+# self
echo
install_with_bundler
+# config
+echo '$aa = { :uri => nil }' > $OT_CONFIG_DIR/config/$SELF.rb
+
echo
echo "Installation finished."
echo
diff --git a/bin/fminer-install b/bin/fminer-install
index 5f43624..12d180d 100755
--- a/bin/fminer-install
+++ b/bin/fminer-install
@@ -24,7 +24,7 @@ fi
check_utils "git make sed"
printf "\n%50s\n" "FMINER"
-local DIR=`pwd`
+DIR=`pwd`
eval RUBY_INC="-I`dirname $RUBY_DIR/include/ruby*/*linux/ruby`\ -I`dirname $RUBY_DIR/include/ruby*/ruby`"
eval OPBB_INC="-I/usr/include/openbabel-2.0"
cmd="$GIT submodule init" && run_cmd "$cmd" "Fminer Init"