diff options
| author | davor <vorgrimmlerdavid@gmx.de> | 2012-08-21 15:15:17 +0200 |
|---|---|---|
| committer | davor <vorgrimmlerdavid@gmx.de> | 2012-08-21 15:15:17 +0200 |
| commit | 041e52e0ad03e9a7a1ae0258de7e9145c3345d8a (patch) | |
| tree | 1aebd218bc9a54592b5660e8a1bc9eadf9beaf86 | |
| parent | d2a8bcd2a16aa94028131d4de25c7f8d813ebd79 (diff) | |
| parent | 2cf6cee1062141dbe7964e3c53fec00e255d0bed (diff) | |
Merge branch 'development' of https://github.com/opentox/install into development
| -rwxr-xr-x | install | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -36,9 +36,9 @@ echo -n "We need to do some privileged action. " 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/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)") +[ -f $OT_PREFIX/install/utils.sh ] || (cmd="mkdir -p $OT_PREFIX/install && cp utils.sh $OT_PREFIX/install" && run_cmd "$cmd" "utils.sh => OT_PREFIX/install") +[ -f $HOME/.opentox/config/install/config.sh ] || (cmd="mkdir -p $HOME/.opentox/config/install && cp config.sh $HOME/.opentox/config/install" && run_cmd "$cmd" "config.sh => $HOME/.opentox/config/install") +[ -f $OT_DEFAULT_CONF ] || (cmd="echo '\$aa = { :uri => nil }' > $OT_DEFAULT_CONF" && run_cmd "$cmd" "default.rb => $HOME/.opentox/config") . ./base-install # Debian specific; disable this for others. ./raptor2-install # Download, compile and build raptor2. Install to OT_PREFIX. |