summaryrefslogtreecommitdiff
path: root/utils.sh
diff options
context:
space:
mode:
Diffstat (limited to 'utils.sh')
-rwxr-xr-xutils.sh17
1 files changed, 5 insertions, 12 deletions
diff --git a/utils.sh b/utils.sh
index b4cceab..5c34539 100755
--- a/utils.sh
+++ b/utils.sh
@@ -79,7 +79,7 @@ install_ruby() {
if ! $RBENV versions $RUBY_NUM_VER | grep $RUBY_NUM_VER>/dev/null 2>&1; then
[ -d $OT_PREFIX/tmp ] || mkdir -p $OT_PREFIX/tmp && cd $OT_PREFIX/tmp
([ -d $OT_PREFIX/tmp/ruby-$RUBY_NUM_VER ] || $CURL $RUBY_DWL/ruby-$RUBY_NUM_VER.tar.gz 2>/dev/null | $TAR xz) && cd ruby-$RUBY_NUM_VER
- cmd="./configure --prefix=$RUBY_DIR" && run_cmd "$cmd" "Configure"
+ cmd="./configure --prefix=$HOME/.rbenv/versions/$RUBY_NUM_VER" && run_cmd "$cmd" "Configure"
cmd="$MAKE -j2" && run_cmd "$cmd" "Make"
cmd="$MAKE install" && run_cmd "$cmd" "Install"
fi
@@ -120,20 +120,13 @@ notify() {
echo
if ps -o stat= -p $PPID | grep "s" >/dev/null 2>&1; then
echo "IMPORTANT: How to configure your system if everything went fine:"
- echo "IMPORTANT: ot-tools are supported for bash shell."
- echo "IMPORTANT: a) Include '$OT_TOOLS_CONF' in shell startup (e.g. ~/.bashrc)."
- echo "IMPORTANT: b) Manually source '$OT_TOOLS_CONF' every time."
- echo "IMPORTANT: The command in both cases: '. $OT_TOOLS_CONF'"
- echo "IMPORTANT: If you are using another shell please source '$OT_UI_CONF'"
- echo "IMPORTANT: NOW would be the best time to configure!"
- echo "Visit 'http://opentox.github.com/General/2012/08/09/install-opentox-development-environment/' for further information (e.g. the usage of ot-tools)."
- echo
- echo "Thank you for your attention."
- echo
+ 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: Thank you for your attention."
fi
}
-
# Force loading configuration from local, if we are installing for the first time
if [ -z "$OT_PREFIX" ]; then
. ./config.sh