From 8b56fa22224cf149c5644f80fea588f5696c9380 Mon Sep 17 00:00:00 2001 From: Andreas Maunz Date: Thu, 6 Sep 2012 14:05:06 +0200 Subject: Minor fixes --- 4store-install | 2 +- base-install | 2 +- install | 2 +- openbabel-install | 2 +- raptor2-install | 2 +- rasqal-install | 2 +- utils.sh | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/4store-install b/4store-install index ee04738..92414df 100755 --- a/4store-install +++ b/4store-install @@ -27,7 +27,7 @@ cmd="make install" && run_cmd "$cmd" "Make Install" 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_CONF" | grep "four_store">/dev/null 2>&1; then echo '$four_store = { :uri => "http://localhost:9088", :user => "", :password => "" }' >> $OT_DEFAULT_CONF; fi -echo "$SELF configuration has been stored in '$FST_CONF'." +echo "$SELF configuration stored in '$FST_CONF'." if ! grep "$FST_CONF" $OT_UI_CONF >/dev/null 2>&1; then echo '. '$FST_CONF >> $OT_UI_CONF fi diff --git a/base-install b/base-install index 6e549d8..444d7f9 100755 --- a/base-install +++ b/base-install @@ -51,7 +51,7 @@ if [ ! -f $JAVA_CONF ]; then echo "if echo \"\$PATH\" | grep -v \"$OT_JAVA_HOME\">/dev/null 2>&1; then export PATH=\"$OT_JAVA_HOME:\$PATH\"; fi" >> "$JAVA_CONF" echo "if ! [ -d \"\$JAVA_HOME\" ]; then echo \"\$0: '\$OT_JAVA_HOME' is not a directory!\"; fi" >> "$JAVA_CONF" - echo "Java configuration has been stored in '$JAVA_CONF'." + echo "Java configuration stored in '$JAVA_CONF'." if ! grep "$JAVA_CONF" $OT_UI_CONF >/dev/null 2>&1; then echo '. '$JAVA_CONF >> $OT_UI_CONF fi diff --git a/install b/install index c8f335f..66dc4e2 100755 --- a/install +++ b/install @@ -59,7 +59,7 @@ fi [ -f $HOME/.opentox/config/pc_descriptors.yaml ] || (cmd="cp pc_descriptors.yaml $HOME/.opentox/config/" && run_cmd "$cmd" "Pc descriptor 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" "ot-tools.sh => $HOME/.opentox)") +[ -f $OT_TOOLS_CONF ] || (cmd="cp ot-tools-user.sh $OT_TOOLS_CONF" && run_cmd "$cmd" "ot-tools.sh => $HOME/.opentox") # Install global ruby version diff --git a/openbabel-install b/openbabel-install index 5f183c5..e7dd43f 100755 --- a/openbabel-install +++ b/openbabel-install @@ -35,7 +35,7 @@ if [ ! -f "$OB_CONF" ]; then echo "if [ -z \"\$BABEL_DATADIR\" ]; then export BABEL_DATADIR=\"$OB_DEST/share/openbabel/$OB_NUM_VER\"; fi" >> "$OB_CONF" echo "if ! [ -d \"\$BABEL_DATADIR\" ]; then echo \"\$0: '\$BABEL_DATADIR' is not a directory!\"; fi" >> "$OB_CONF" - echo "Openbabel configuration has been stored in '$OB_CONF'." + echo "Openbabel configuration stored in '$OB_CONF'." if ! grep "$OB_CONF" $OT_UI_CONF >/dev/null 2>&1 ; then echo ". \"$OB_CONF\"" >> $OT_UI_CONF fi diff --git a/raptor2-install b/raptor2-install index 4d3be2e..4c7528d 100755 --- a/raptor2-install +++ b/raptor2-install @@ -23,7 +23,7 @@ cmd="$MAKE install" && run_cmd "$cmd" "Make Install" # Config echo "if echo \"\$LD_LIBRARY_PATH\" | $GREP -v \"$RAPTOR2_DIR/lib\">/dev/null 2>&1; then export LD_LIBRARY_PATH=\"$RAPTOR2_DIR/lib:\$LD_LIBRARY_PATH\"; fi" >> "$RAPTOR2_CONF" echo "if echo \"\$PKG_CONFIG_PATH\" | $GREP -v \"$RAPTOR2_DIR/lib/pkgconfig\">/dev/null 2>&1; then export PKG_CONFIG_PATH=\"$RAPTOR2_DIR/lib/pkgconfig:\$PKG_CONFIG_PATH\"; fi" >> "$RAPTOR2_CONF" -echo "$SELF configuration has been stored in '$RAPTOR2_CONF'." +echo "$SELF configuration stored in '$RAPTOR2_CONF'." if ! $GREP "$RAPTOR2_CONF" $OT_UI_CONF >/dev/null 2>&1; then echo '. '$RAPTOR2_CONF >> $OT_UI_CONF fi diff --git a/rasqal-install b/rasqal-install index 8bd9fbd..2934a2b 100755 --- a/rasqal-install +++ b/rasqal-install @@ -22,7 +22,7 @@ cmd="$MAKE install" && run_cmd "$cmd" "Make Install" # Config echo "if echo \"\$LD_LIBRARY_PATH\" | $GREP -v \"$RASQAL_DIR/lib\">/dev/null 2>&1; then export LD_LIBRARY_PATH=\"$RASQAL_DIR/lib:\$LD_LIBRARY_PATH\"; fi" >> "$RASQAL_CONF" echo "if echo \"\$PKG_CONFIG_PATH\" | $GREP -v \"$RASQAL_DIR/lib/pkgconfig\">/dev/null 2>&1; then export PKG_CONFIG_PATH=\"$RASQAL_DIR/lib/pkgconfig:\$PKG_CONFIG_PATH\"; fi" >> "$RASQAL_CONF" -echo "$SELF configuration has been stored in '$RASQAL_CONF'." +echo "$SELF configuration stored in '$RASQAL_CONF'." if ! $GREP "$RASQAL_CONF" $OT_UI_CONF >/dev/null 2>&1; then echo '. '$RASQAL_CONF >> $OT_UI_CONF fi diff --git a/utils.sh b/utils.sh index 5c34539..9b5e910 100755 --- a/utils.sh +++ b/utils.sh @@ -122,7 +122,7 @@ notify() { echo "IMPORTANT: How to configure your system if everything went fine:" echo "IMPORTANT: bash shell only: '. $OT_TOOLS_CONF; otconfig' (convenient ot-tools)" echo "IMPORTANT: other shells: '. $OT_UI_CONF' (no ot-tools available)" - echo "IMPORTANT: More information: 'http://opentox.github.com/General/2012/08/09/install-opentox-development-environment'" + echo "IMPORTANT: More information on setup: 'http://opentox.github.com/categories.html'" echo "IMPORTANT: Thank you for your attention." fi } -- cgit v1.2.3