diff options
| author | yalh76 <yalh@yahoo.com> | 2020-06-09 19:28:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-09 19:28:30 +0200 |
| commit | 01d0696ff7d2a60a3911089cefc0221cf73eca1d (patch) | |
| tree | f0ee80538ae4d3f5d51823bed49ec7169b954a06 /scripts/ynh_install_ruby__2 | |
| parent | 6b30109fc986d83166b1805ec3ad7e28200e3743 (diff) | |
| parent | d3df899e0a99a63ee1cf7ad845cc513aeaaf30ef (diff) | |
| download | mastodon_ynh-01d0696ff7d2a60a3911089cefc0221cf73eca1d.tar.gz mastodon_ynh-01d0696ff7d2a60a3911089cefc0221cf73eca1d.tar.bz2 mastodon_ynh-01d0696ff7d2a60a3911089cefc0221cf73eca1d.zip | |
make some cleaning of scripts
make some cleaning of scripts
Diffstat (limited to 'scripts/ynh_install_ruby__2')
| -rw-r--r-- | scripts/ynh_install_ruby__2 | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/scripts/ynh_install_ruby__2 b/scripts/ynh_install_ruby__2 index f064c08..df03e07 100644 --- a/scripts/ynh_install_ruby__2 +++ b/scripts/ynh_install_ruby__2 @@ -22,8 +22,8 @@ SOURCE_SUM=80ad89ffe04c0b481503bd375f05c212bbc7d44ef5f5e649e0acdf25eba86736" > " # Build an app.src for ruby-build mkdir -p "../conf" - echo "SOURCE_URL=https://github.com/rbenv/ruby-build/archive/v20191004.tar.gz -SOURCE_SUM=6f053957acb0af6d621ebf2b9dacc9c265844b2dc6842a021eb10f0a70094fe8" > "../conf/ruby-build.src" + echo "SOURCE_URL=https://github.com/rbenv/ruby-build/archive/v20200520.tar.gz +SOURCE_SUM=52be6908a94fbd4a94f5064e8b19d4a3baa4b773269c3884165518d83bcc8922" > "../conf/ruby-build.src" # Download and extract ruby-build ynh_setup_source "$rbenv_install_dir/plugins/ruby-build" ruby-build @@ -79,7 +79,10 @@ ynh_install_ruby () { if ! type rbenv > /dev/null 2>&1 then ynh_install_rbenv - elif dpkg --compare-versions "$(/opt/rbenv/bin/rbenv --version | cut -d" " -f2)" lt "1.1.2" + elif dpkg --compare-versions "$($rbenv_install_dir/bin/rbenv --version | cut -d" " -f2)" lt "1.1.2" + then + ynh_install_rbenv + elif dpkg --compare-versions "$($rbenv_install_dir/plugins/ruby-build/bin/ruby-build --version | cut -d" " -f2)" lt "20200520" then ynh_install_rbenv fi @@ -91,7 +94,7 @@ ynh_install_ruby () { test -x /usr/bin/ruby_rbenv && mv /usr/bin/ruby_rbenv /usr/bin/ruby # Install the requested version of ruby - CONFIGURE_OPTS="--disable-install-doc" MAKE_OPTS="-j2" rbenv install --skip-existing $ruby_version + CONFIGURE_OPTS="--disable-install-doc --with-jemalloc" MAKE_OPTS="-j2" rbenv install --skip-existing $ruby_version # Store the ID of this app and the version of ruby requested for it echo "$YNH_APP_ID:$ruby_version" | tee --append "$rbenv_install_dir/ynh_app_version" |