diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/install | 10 | ||||
| -rw-r--r-- | scripts/upgrade | 20 |
2 files changed, 15 insertions, 15 deletions
diff --git a/scripts/install b/scripts/install index 8782cdb..42d046a 100644 --- a/scripts/install +++ b/scripts/install @@ -161,14 +161,14 @@ eval \"\$(rbenv init -)\"" > $final_path/.profile # Install ruby-build ( - exec_as "$app" $final_path/.rbenv/bin/rbenv install 2.5.3 || true - exec_as "$app" $final_path/.rbenv/bin/rbenv global 2.5.3 || true - exec_as "$app" $final_path/.rbenv/versions/2.5.3/bin/ruby -v + exec_as "$app" $final_path/.rbenv/bin/rbenv install 2.6.0 || true + exec_as "$app" $final_path/.rbenv/bin/rbenv global 2.6.0 || true + exec_as "$app" $final_path/.rbenv/versions/2.6.0/bin/ruby -v ) # Create symlink for ruby rm /usr/bin/ruby || true -ln -s $final_path/.rbenv/versions/2.5.3/bin/ruby /usr/bin/ruby || true +ln -s $final_path/.rbenv/versions/2.6.0/bin/ruby /usr/bin/ruby || true # Adjust Mastodon config @@ -206,7 +206,7 @@ chown -R "$app": "$final_path" ( cd "$final_path/live" su mastodon <<INSTALL - $final_path/.rbenv/versions/2.5.3/bin/gem install bundler:1.16.6 --no-ri --no-rdoc + $final_path/.rbenv/versions/2.6.0/bin/gem install bundler:1.16.6 --no-ri --no-rdoc $final_path/live/bin/bundle install \ -j$(getconf _NPROCESSORS_ONLN) \ --deployment --without development test diff --git a/scripts/upgrade b/scripts/upgrade index d337e6d..3c0405c 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -144,25 +144,25 @@ chown -R "$app": "$final_path" # Install ruby 2.5.1 ( - exec_as "$app" $final_path/.rbenv/bin/rbenv install -s 2.5.3 || true - exec_as "$app" $final_path/.rbenv/bin/rbenv global 2.5.3 || true - exec_as "$app" $final_path/.rbenv/versions/2.5.3/bin/ruby -v + exec_as "$app" $final_path/.rbenv/bin/rbenv install -s 2.6.0 || true + exec_as "$app" $final_path/.rbenv/bin/rbenv global 2.6.0 || true + exec_as "$app" $final_path/.rbenv/versions/2.6.0/bin/ruby -v ) # Create symlink for ruby rm /usr/bin/ruby || true -ln -s $final_path/.rbenv/versions/2.5.3/bin/ruby /usr/bin/ruby || true +ln -s $final_path/.rbenv/versions/2.6.0/bin/ruby /usr/bin/ruby || true # Preconfig CSS & JS # Install Mastodon ( sudo su - $app <<MCOMMANDS pushd ~/live -$final_path/.rbenv/versions/2.5.3/bin/gem install bundler +$final_path/.rbenv/versions/2.6.0/bin/gem install bundler if [ "$(lsb_release --codename --short)" == "jessie" ]; then - $final_path/.rbenv/versions/2.5.3/bin/bundle install --deployment --without development test + $final_path/.rbenv/versions/2.6.0/bin/bundle install --deployment --without development test else - $final_path/.rbenv/versions/2.5.3/bin/bundle install --deployment --force --without development test + $final_path/.rbenv/versions/2.6.0/bin/bundle install --deployment --force --without development test fi yarn install --pure-lockfile MCOMMANDS @@ -177,13 +177,13 @@ popd # Apply Mastodon upgrade ( pushd $final_path/live -RAILS_ENV=production $final_path/.rbenv/versions/2.5.3/bin/bundle exec rails assets:clean -RAILS_ENV=production $final_path/.rbenv/versions/2.5.3/bin/bundle exec rails assets:precompile +RAILS_ENV=production $final_path/.rbenv/versions/2.6.0/bin/bundle exec rails assets:clean +RAILS_ENV=production $final_path/.rbenv/versions/2.6.0/bin/bundle exec rails assets:precompile popd sudo su - $app <<COMMANDS pushd ~/live -RAILS_ENV=production $final_path/.rbenv/versions/2.5.3/bin/bundle exec rails db:migrate +RAILS_ENV=production $final_path/.rbenv/versions/2.6.0/bin/bundle exec rails db:migrate COMMANDS ) |