diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/_common.sh | 4 | ||||
| -rw-r--r-- | scripts/install | 13 | ||||
| -rw-r--r-- | scripts/upgrade | 12 |
3 files changed, 21 insertions, 8 deletions
diff --git a/scripts/_common.sh b/scripts/_common.sh index 2cf8424..d03e8ff 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -7,11 +7,11 @@ # dependencies used by the app pkg_dependencies="imagemagick ffmpeg libpq-dev libxml2-dev libxslt1-dev file git-core g++ libprotobuf-dev protobuf-compiler pkg-config gcc autoconf bison build-essential libssl-dev libyaml-dev libreadline6-dev zlib1g-dev libncurses5-dev libffi-dev libgdbm3|libgdbm6 libgdbm-dev redis-server redis-tools postgresql postgresql-contrib libidn11-dev libicu-dev libjemalloc-dev curl apt-transport-https" -RUBY_VERSION="2.6.5" +RUBY_VERSION="2.6.6" BUNDLER_VERSION="1.17.3" -NODEJS_VERSION="10" +NODEJS_VERSION="12" MEMORY_NEEDED="2560" diff --git a/scripts/install b/scripts/install index 53b598b..0c92114 100644 --- a/scripts/install +++ b/scripts/install @@ -103,10 +103,17 @@ ynh_script_progression --message="Setting up source files..." ynh_app_setting_set --app=$app --key=final_path --value=$final_path # Download, check integrity, uncompress and patch the source from app.src mkdir $final_path -ynh_setup_source --dest_dir="$final_path/live" -# Temporary workaround for https://github.com/tootsuite/mastodon/issues/13292 -ynh_replace_string --match_string="sidekiq-unique-jobs (6.0.18)" --replace_string="sidekiq-unique-jobs (6.0.20)" --target_file="$final_path/live/Gemfile.lock" +if [ "$(lsb_release --codename --short)" = "buster" ]; then + ynh_setup_source --dest_dir="$final_path/live" +else + ynh_script_progression --message="Setting up source files..." + + ynh_setup_source --dest_dir="$final_path/live" --source_id=jessie + + # Temporary workaround for https://github.com/tootsuite/mastodon/issues/13292 + ynh_replace_string --match_string="sidekiq-unique-jobs (6.0.18)" --replace_string="sidekiq-unique-jobs (6.0.20)" --target_file="$final_path/live/Gemfile.lock" +fi #================================================= # NGINX CONFIGURATION diff --git a/scripts/upgrade b/scripts/upgrade index 6ed16ef..f10087a 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -183,10 +183,16 @@ then fi rsync -a "$config" "$tmpdir/." ynh_secure_remove --file="$final_path/live" - ynh_setup_source --dest_dir="$final_path/live" + if [ "$(lsb_release --codename --short)" = "buster" ]; then + ynh_setup_source --dest_dir="$final_path/live" + else + ynh_script_progression --message="Setting up source files..." - # Temporary workaround for https://github.com/tootsuite/mastodon/issues/13292 - ynh_replace_string --match_string="sidekiq-unique-jobs (6.0.18)" --replace_string="sidekiq-unique-jobs (6.0.20)" --target_file="$final_path/live/Gemfile.lock" + ynh_setup_source --dest_dir="$final_path/live" --source_id=jessie + + # Temporary workaround for https://github.com/tootsuite/mastodon/issues/13292 + ynh_replace_string --match_string="sidekiq-unique-jobs (6.0.18)" --replace_string="sidekiq-unique-jobs (6.0.20)" --target_file="$final_path/live/Gemfile.lock" + fi if [ -d "$final_path/system.tmp" ]; then mv --verbose --no-target-directory "$final_path/system.tmp" "$final_path/live/public/system" |