diff options
| author | yalh76 <yalh@yahoo.com> | 2020-02-16 15:20:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-16 15:20:36 +0100 |
| commit | 1fad8df86b235802e1600ae700cf1d4f6f4f96f5 (patch) | |
| tree | 078860c4612bd3dc5a7c74655452f5bec1285e15 /scripts | |
| parent | a85f1bbe2f147fe89098e26a4b17922390eabeeb (diff) | |
| parent | 0fd7fb74c49b2226a8c28d9769ac3fc600dea784 (diff) | |
| download | mastodon_ynh-1fad8df86b235802e1600ae700cf1d4f6f4f96f5.tar.gz mastodon_ynh-1fad8df86b235802e1600ae700cf1d4f6f4f96f5.tar.bz2 mastodon_ynh-1fad8df86b235802e1600ae700cf1d4f6f4f96f5.zip | |
Merge pull request #191 from YunoHost-Apps/3.1.1
Upgrade to 3.1.1
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/install | 2 | ||||
| -rw-r--r-- | scripts/restore | 2 | ||||
| -rw-r--r-- | scripts/upgrade | 19 |
3 files changed, 10 insertions, 13 deletions
diff --git a/scripts/install b/scripts/install index 8c903b5..58f0caa 100644 --- a/scripts/install +++ b/scripts/install @@ -79,7 +79,7 @@ ynh_app_setting_set --app=$app --key=port_stream --value=$port_stream #================================================= ynh_script_progression --message="Installing dependencies..." --weight=86 -ynh_install_nodejs --nodejs_version="8" +ynh_install_nodejs --nodejs_version="10" ynh_install_app_dependencies $pkg_dependencies ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg" diff --git a/scripts/restore b/scripts/restore index de19461..1985b26 100644 --- a/scripts/restore +++ b/scripts/restore @@ -103,7 +103,7 @@ ynh_add_swap --size=$swap_needed #================================================= ynh_script_progression --message="Reinstalling dependencies..." --weight=63 -ynh_install_nodejs --nodejs_version="8" +ynh_install_nodejs --nodejs_version="10" ynh_install_app_dependencies $pkg_dependencies ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg" diff --git a/scripts/upgrade b/scripts/upgrade index 9c7eaf7..9cfe1cc 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -200,7 +200,8 @@ ynh_add_nginx_config 'port_web port_stream' #================================================= ynh_script_progression --message="Upgrading dependencies..." --weight=24 -ynh_install_nodejs --nodejs_version="8" +ynh_remove_nodejs +ynh_install_nodejs --nodejs_version="10" ynh_install_app_dependencies $pkg_dependencies ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg" @@ -273,16 +274,12 @@ chown -R "$app": "$final_path" pushd "$final_path/live" ynh_use_nodejs - if [ "$(lsb_release --codename --short)" == "jessie" ]; then - sudo -u "$app" env PATH=$PATH /opt/rbenv/versions/2.6.5/bin/bundle install --deployment --without development test - else - sudo -u "$app" env PATH=$PATH /opt/rbenv/versions/2.6.5/bin/bundle install --deployment --force --without development test - fi - sudo -u "$app" env PATH=$PATH yarn install --pure-lockfile - sudo -u "$app" env PATH=$PATH RAILS_ENV=production /opt/rbenv/versions/2.6.5/bin/bundle exec rails assets:clean - sudo -u "$app" env PATH=$PATH RAILS_ENV=production /opt/rbenv/versions/2.6.5/bin/bundle exec rails assets:precompile - sudo -u "$app" env PATH=$PATH RAILS_ENV=production /opt/rbenv/versions/2.6.5/bin/bundle exec rails db:migrate - sudo -u "$app" env PATH=$PATH RAILS_ENV=production bin/tootctl cache clear + sudo -u "$app" env PATH=$PATH /opt/rbenv/versions/2.6.5/bin/bundle install -j$(getconf _NPROCESSORS_ONLN) --deployment --without development test + sudo -u "$app" env PATH=$PATH yarn install --pure-lockfile + sudo -u "$app" env PATH=$PATH RAILS_ENV=production /opt/rbenv/versions/2.6.5/bin/bundle exec rails assets:clean + sudo -u "$app" env PATH=$PATH RAILS_ENV=production /opt/rbenv/versions/2.6.5/bin/bundle exec rails assets:precompile + sudo -u "$app" env PATH=$PATH RAILS_ENV=production /opt/rbenv/versions/2.6.5/bin/bundle exec rails db:migrate + sudo -u "$app" env PATH=$PATH RAILS_ENV=production bin/tootctl cache clear popd # If vapid_private_key doesn't exist, retrieve it or create it |