From 1c2c03009f4a4c9393e778bfe987326e12212ff7 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 13 Aug 2024 21:38:30 +0200 Subject: [PATCH] fix --- manifest.toml | 8 ++++---- scripts/install | 2 +- scripts/upgrade | 12 ++++-------- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/manifest.toml b/manifest.toml index 783495e..4fd4279 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Libreddit" description.en = "Libre alternative to Reddit" description.fr = "Alternative libre à Reddit" -version = "0.30.1~ynh4" +version = "0.35.1~ynh1" maintainers = [] @@ -16,7 +16,7 @@ demo = "https://libreddit.spike.codes/" code = "https://github.com/spikecodes/libreddit" [integration] -yunohost = ">= 11.2" +yunohost = ">= 11.2.20" architectures = ["amd64"] multi_instance = true ldap = false @@ -37,8 +37,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://github.com/spikecodes/libreddit/releases/download/v0.30.0/libreddit" - sha256 = "7148815a160acf4b19d5fec1e3c47f9fc7a850a212f3b83ed88a1a76c39882c9" + url = "https://github.com/redlib-org/redlib/releases/download/v0.35.1/redlib-x86_64-unknown-linux-musl.tar.gz" + sha256 = "fbd1abd1ccd418e397b0ec3cf449fcd2faae6fbe0873c3485636d9785efb0471" extract = false in_subdir = false rename = "libreddit" diff --git a/scripts/install b/scripts/install index aaf5609..d3cb5b9 100755 --- a/scripts/install +++ b/scripts/install @@ -38,7 +38,7 @@ yunohost service add $app --description="Alternative to Reddit" --log="/var/log/ #================================================= ynh_script_progression --message="Adding a configuration file..." --weight=1 -ynh_add_config --template="../conf/libreddit.conf" --destination="$install_dir/libreddit.conf" +ynh_add_config --template="libreddit.conf" --destination="$install_dir/libreddit.conf" chmod 400 "$install_dir/libreddit.conf" chown $app:$app "$install_dir/libreddit.conf" diff --git a/scripts/upgrade b/scripts/upgrade index 54c30d4..9ebb616 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -27,14 +27,10 @@ ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd" #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= +ynh_script_progression --message="Upgrading source files..." --weight=5 -if [ "$upgrade_type" == "UPGRADE_APP" ] -then - ynh_script_progression --message="Upgrading source files..." --weight=5 - - # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$install_dir" --keep="libreddit.conf" -fi +# Download, check integrity, uncompress and patch the source from app.src +ynh_setup_source --dest_dir="$install_dir" --keep="libreddit.conf" chown -R $app:www-data "$install_dir" chmod +x $install_dir/libreddit @@ -57,7 +53,7 @@ yunohost service add $app --description="Alternative to Reddit" --log="/var/log/ #================================================= #ynh_script_progression --message="Updating a configuration file..." --weight=1 -# ynh_add_config --template="../conf/libreddit.conf" --destination="$install_dir/libreddit.conf" +# ynh_add_config --template="libreddit.conf" --destination="$install_dir/libreddit.conf" # chmod 400 "$install_dir/libreddit.conf" # chown $app:$app "$install_dir/libreddit.conf"