Skip to content

Commit 60cceb9

Browse files
committed
Better rbenv installation error handling
1 parent fe06989 commit 60cceb9

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed

lib/ndr_dev_support/capistrano/install_ruby.rb

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,17 @@
3737
tar xf /opt/rbenv.tar.gz .rbenv;
3838
PATH=\\`echo \\"\\$PATH\\"|sed -e \\"s_[^:=]*/[.]rbenv[^:]*:__g\\"\\` .rbenv/bin/rbenv init bash;
3939
fi;
40-
eval \\"\\$(.rbenv/bin/rbenv init - --no-rehash bash)\\";
41-
export TMPDIR=\\`mktemp -d \\"\\$HOME\\"/rbenv_tmp_XXXX\\`;
42-
set +e;
43-
rbenv install #{version} --skip-existing 2>&1;
44-
set -e;
45-
RBENV_VERSION=#{version} ruby --version;
46-
rm -rf \\"\\`printenv TMPDIR\\`\\";
47-
rbenv global #{version};
40+
if [ ! -e .rbenv ]; then
41+
echo rbenv not installed: aborting;
42+
else
43+
eval \\"\\$(.rbenv/bin/rbenv init - --no-rehash bash)\\";
44+
export TMPDIR=\\`mktemp -d \\"\\$HOME\\"/rbenv_tmp_XXXX\\`;
45+
if rbenv install #{version} --skip-existing 2>&1; then
46+
RBENV_VERSION=#{version} ruby --version;
47+
rm -rf \\"\\`printenv TMPDIR\\`\\";
48+
rbenv global #{version};
49+
fi;
50+
fi;
4851
";
4952
{ kill % && wait; } 2> /dev/null;
5053
set -e;

0 commit comments

Comments
 (0)