summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordavor <vorgrimmlerdavid@gmx.de>2012-08-15 09:38:52 +0200
committerdavor <vorgrimmlerdavid@gmx.de>2012-08-15 09:38:52 +0200
commitc3c26fc7569c4ff8518b604bfcc641e0805b0333 (patch)
treef2714b577f6198e351bd94cf6891fb675c8e56cf
parent636a03bf0022ce5275ac5b7683fb694ddf9ee161 (diff)
Minor fixes.
-rwxr-xr-x4store-install2
-rw-r--r--debian.list1
-rwxr-xr-xinstall2
3 files changed, 3 insertions, 2 deletions
diff --git a/4store-install b/4store-install
index 6eebff7..c87c2d9 100755
--- a/4store-install
+++ b/4store-install
@@ -46,4 +46,4 @@ notify
# return to wd
cd $DIR
. ./utils.sh
-cmd="$HOME/opentox-ruby/4S/bin/4s-backend-setup opentox" && run_cmd "$cmd" "Create 'opentox' 4store backend"
+cmd="$FST/bin/4s-backend-setup opentox" && run_cmd "$cmd" "Create 'opentox' 4store backend"
diff --git a/debian.list b/debian.list
index 86a87c0..8667119 100644
--- a/debian.list
+++ b/debian.list
@@ -11,6 +11,7 @@ libpcre3-dev install
libreadline-dev install
libtool install
libtool install
+libyaml-dev install
ncurses-dev install
openjdk-6-jdk install
r-base-dev install
diff --git a/install b/install
index bebae73..5105689 100755
--- a/install
+++ b/install
@@ -38,7 +38,7 @@ echo
[ -f $OT_PREFIX/install/utils.sh ] || (cmd="mkdir -p $OT_PREFIX/install && cp utils.sh $OT_PREFIX/install" && run_cmd "$cmd" "Install utils.sh to OT_PREFIX")
[ -f $HOME/.opentox/config/install/config.sh ] || (cmd="mkdir -p $HOME/.opentox/config/install && cp config.sh $HOME/.opentox/config/install" && run_cmd "$cmd" "Install config.sh to CONFIG (~/.opentox/config)")
-[ -f $OT_DEFAULT_CONF ] || (cmd="echo '\$aa = { :uri => nil }' > $OT_DEFAULT_CONF" && run_cmd "$cmd" "Install default.rb to CONFIG (~/.opentox)")
+[ -f $OT_DEFAULT_CONF ] || (cmd="echo '\$aa = { :uri => nil }' > $OT_DEFAULT_CONF" && run_cmd "$cmd" "Install default.rb to CONFIG (~/.opentox/conf)")
. ./base-install # Debian specific; disable this for others.