diff options
| author | nemsia <nemsia@nemsia.org> | 2018-06-12 23:26:56 +0200 |
|---|---|---|
| committer | nemsia <nemsia@nemsia.org> | 2018-06-12 23:26:56 +0200 |
| commit | 29c54691fe2d7f105b346ac23d38b86b3c187f3a (patch) | |
| tree | 11d63d1cc387ea9ad3552bffb70fe50df16f9794 /scripts/upgrade | |
| parent | 4d552172643c981e10490e21e4c343baad5a933e (diff) | |
| parent | ae04282b9e5bb3a2dff513b1c37c0ff54fd95db4 (diff) | |
| download | mastodon_ynh-29c54691fe2d7f105b346ac23d38b86b3c187f3a.tar.gz mastodon_ynh-29c54691fe2d7f105b346ac23d38b86b3c187f3a.tar.bz2 mastodon_ynh-29c54691fe2d7f105b346ac23d38b86b3c187f3a.zip | |
Merge branch 'testing-2.4' of https://github.com/YunoHost-Apps/mastodon_ynh into YunoHost-Apps-testing-2.4
Diffstat (limited to 'scripts/upgrade')
| -rw-r--r-- | scripts/upgrade | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/upgrade b/scripts/upgrade index 3858ee8..d50b729 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -15,7 +15,7 @@ source /usr/share/yunohost/helpers # See comments in install script app=$YNH_APP_INSTANCE_NAME -db_name=$app +db_name=$(ynh_app_setting_get "$app" db_name) # Retrieve app settings domain=$(ynh_app_setting_get "$app" domain) @@ -31,7 +31,7 @@ path_url="/" # If db_name doesn't exist, create it if [ -z "$db_name" ]; then - db_name=$(ynh_sanitize_dbid "$app") + db_name="${app}_production" ynh_app_setting_set "$app" db_name "$db_name" fi @@ -115,7 +115,7 @@ ynh_setup_source "$final_path/.rbenv/plugins/ruby-build" "app-ruby-build" # Install ruby 2.5.1 ( - exec_as "$app" $final_path/.rbenv/bin/rbenv install 2.5.1 || true + exec_as "$app" $final_path/.rbenv/bin/rbenv install -s 2.5.1 || true exec_as "$app" $final_path/.rbenv/bin/rbenv global 2.5.1 || true exec_as "$app" $final_path/.rbenv/versions/2.5.1/bin/ruby -v ) |