From 8a505d8c85cf812c48595b2a6ff47c9a90866fa5 Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Thu, 29 Oct 2020 23:23:19 +0100
Subject: Remove Jessie support

---
 scripts/install | 13 +------------
 scripts/upgrade | 12 ++----------
 2 files changed, 3 insertions(+), 22 deletions(-)

(limited to 'scripts')

diff --git a/scripts/install b/scripts/install
index 0c92114..01a2efc 100644
--- a/scripts/install
+++ b/scripts/install
@@ -102,18 +102,7 @@ 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
-
-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
+ynh_setup_source --dest_dir="$final_path/live"
 
 #=================================================
 # NGINX CONFIGURATION
diff --git a/scripts/upgrade b/scripts/upgrade
index f10087a..2914550 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -183,16 +183,8 @@ then
 	fi
 	rsync -a "$config" "$tmpdir/."
 	ynh_secure_remove --file="$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..."
-
-        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
+	
+	ynh_setup_source --dest_dir="$final_path/live"
 
 	if [ -d "$final_path/system.tmp" ]; then
 		mv --verbose --no-target-directory "$final_path/system.tmp" "$final_path/live/public/system"
-- 
cgit v1.2.3-70-g09d2