diff options
| author | Andreas Maunz <andreas@maunz.de> | 2012-08-21 13:38:41 +0200 |
|---|---|---|
| committer | Andreas Maunz <andreas@maunz.de> | 2012-08-21 13:38:41 +0200 |
| commit | 714111145e6ac5778dc5ce2ecb3652e4bddb34d7 (patch) | |
| tree | ba7e3723cc34215fd9e48a97854e8a09b9a20e70 /install | |
| parent | 3faf3c96fa31163e2201240e47f27a6571111ab7 (diff) | |
| parent | f87da673e2437e2728b31c84b2ae1cfdf05915c5 (diff) | |
Merge branch 'development' of github.com:opentox/install into development
Diffstat (limited to 'install')
| -rwxr-xr-x | install | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -37,9 +37,8 @@ sudo echo -n "" 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/config)") - +[ -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/install)") +[ -f $OT_DEFAULT_CONF ] || (cmd="echo '\$aa = { :uri => nil }' > $OT_DEFAULT_CONF" && run_cmd "$cmd" "Created default.rb service settings (stored in ~/.opentox/config)") . ./base-install # Debian specific; disable this for others. ./raptor2-install # Download, compile and build raptor2. Install to OT_PREFIX. @@ -59,7 +58,7 @@ fi [ -f $HOME/.opentox/config/ambit_descriptors.yaml ] || (cmd="cp ambit_descriptors.yaml $HOME/.opentox/config/" && run_cmd "$cmd" "Ambit keys file") [ -f $HOME/.opentox/config/jl_keys.yaml ] || (cmd="cp jl_keys.yaml $HOME/.opentox/config/" && run_cmd "$cmd" "Joelib keys file") -[ -f $OT_TOOLS_CONF ] || (cmd="cp ot-tools-user.sh $OT_TOOLS_CONF" && run_cmd "$cmd" "Install ot-tools.sh to CONFIG (~/.opentox/config)") +[ -f $OT_TOOLS_CONF ] || (cmd="cp ot-tools-user.sh $OT_TOOLS_CONF" && run_cmd "$cmd" "Created ot-tools (stored in ~/.opentox)") # Install global ruby version |