summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorist <ist@ISTdebian64.(none)>2012-08-07 10:09:55 +0200
committerist <ist@ISTdebian64.(none)>2012-08-07 10:09:55 +0200
commitb62e242752adc914bab4535655c0756b300e2a25 (patch)
treea751e7ae6e9b3d2bb00558ea67e4dc64465b0776
parent912c1cafced44cf97e3fb310657a2fae1625a875 (diff)
Minor changes.
-rwxr-xr-xinstall3
-rwxr-xr-xservices-install3
-rwxr-xr-xutils.sh4
3 files changed, 7 insertions, 3 deletions
diff --git a/install b/install
index 2e1304e..3d1793f 100755
--- a/install
+++ b/install
@@ -56,5 +56,6 @@ 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")
-notify
+. ./services-install
+notify
diff --git a/services-install b/services-install
index 9165b9e..bee1719 100755
--- a/services-install
+++ b/services-install
@@ -9,6 +9,9 @@ RUBY_NUM_VER="1.9.3-p194"
echo
echo "Welcome to service installation (<Return> to continue)."
read delete_me
+echo
+echo "Development installation: Have you added public ssh key to GitHub? (<Return> to continue)."
+read delete_me
# check wd is root of service
diff --git a/utils.sh b/utils.sh
index 130525e..8ca267e 100755
--- a/utils.sh
+++ b/utils.sh
@@ -71,10 +71,10 @@ check_utils() {
install_ruby() {
printf "\n%50s\n" "RUBY"
local DIR=`pwd`
- check_utils "rbenv curl make"
+ check_utils "rbenv curl make tar"
if ! $RBENV versions $RUBY_NUM_VER | grep $RUBY_NUM_VER>/dev/null 2>&1; then
[ -d $DIR/tmp ] || mkdir -p $DIR/tmp && cd $DIR/tmp
- ([ -d $DIR/tmp/ruby-$RUBY_NUM_VER ] || $CURL $RUBY_DWL/ruby-$RUBY_NUM_VER.tar.gz 2>/dev/null | tar xz) && cd ruby-$RUBY_NUM_VER
+ ([ -d $DIR/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="$MAKE -j2" && run_cmd "$cmd" "Make"
cmd="$MAKE install" && run_cmd "$cmd" "Install"