diff options
author | davor <vorgrimmlerdavid@gmx.de> | 2012-08-13 17:34:56 +0200 |
---|---|---|
committer | davor <vorgrimmlerdavid@gmx.de> | 2012-08-13 17:34:56 +0200 |
commit | 94708cb27d09a56e884cbd5016893e87b733f5c3 (patch) | |
tree | 4c5570d01228e5a9efbac6dd78af434721fa2b76 | |
parent | 4f2fec4e7e2a53bbc421db5da08f37152495188d (diff) | |
parent | 4ac88ead29e9fe7472345e2e213c9ab404bcf23b (diff) |
Merge branch 'development' of https://github.com/opentox/install into development
Conflicts:
4store-install
-rwxr-xr-x | 4store-install | 2 | ||||
-rwxr-xr-x | install | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/4store-install b/4store-install index d00ac91..6c8ec39 100755 --- a/4store-install +++ b/4store-install @@ -25,7 +25,7 @@ cmd="make install" && run_cmd "$cmd" "Make Install" # Config echo "if echo \"\$LD_LIBRARY_PATH\" | grep -v \"$FST/lib\">/dev/null 2>&1; then export LD_LIBRARY_PATH=\"\$LD_LIBRARY_PATH:$FST/lib\"; fi" >> "$FST_CONF" -if ! cat "$OT_DEFAULT_CONFIG" | grep "four_store">/dev/null 2>&1; then echo '$four_store = { :uri => "http://localhost:8088", :user => "", :password => "" }' >> $OT_DEFAULT_CONFIG; fi +if ! cat "$OT_DEFAULT_CONFIG" | grep "four_store">/dev/null 2>&1; then echo '\$four_store = { :uri => "http://localhost:8088", :user => "", :password => "" }' >> $OT_DEFAULT_CONFIG; fi echo "$SELF configuration has been stored in '$FST_CONF'." if ! grep "$FST_CONF" $OT_UI_CONF >/dev/null 2>&1; then @@ -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_CONFIG ] || (cmd="echo '$aa = { :uri => nil }' > $OT_DEFAULT_CONFIG" && run_cmd "$cmd" "Install default.rb to CONFIG (~/.opentox/config)") +[ -f $OT_DEFAULT_CONFIG ] || (cmd="echo '\$aa = { :uri => nil }' > $OT_DEFAULT_CONFIG" && run_cmd "$cmd" "Install default.rb to CONFIG (~/.opentox/config)") . ./base-install # Debian specific; disable this for others. |