From 7443dd09c25b2d7aba3008ab3828118b0472ef7e Mon Sep 17 00:00:00 2001 From: Maniack Crudelis Date: Sun, 24 Mar 2019 16:48:12 +0100 Subject: [PATCH 1/3] Update pull_request_template.md --- pull_request_template.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pull_request_template.md b/pull_request_template.md index 033f08c..4e9742c 100644 --- a/pull_request_template.md +++ b/pull_request_template.md @@ -19,7 +19,6 @@ - [ ] **Approval (LGTM)** : - [ ] **Approval (LGTM)** : - **CI succeeded** : -[![Build Status](https://ci-apps-dev.yunohost.org/jenkins/job/transmission_ynh%20-BRANCH-%20(Official)/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/transmission_ynh%20-BRANCH-%20(Official)/) *Please replace '-BRANCH-' in this link for a PR from a local branch.* -or -[![Build Status](https://ci-apps-dev.yunohost.org/jenkins/job/transmission_ynh%20PR-NUM-%20(Official_fork)/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/transmission_ynh%20PR-NUM-%20(Official_fork)/) *Replace '-NUM-' by the PR number in this link for a PR from a forked repository.* +[![Build Status](https://ci-apps-dev.yunohost.org/jenkins/job/transmission_ynh%20PR-NUM-/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/transmission_ynh%20PR-NUM-/) +*Please replace '-NUM-' in this link by the PR number.* When the PR is marked as ready to merge, you have to wait for 3 days before really merging it. From 6491e23d3a50953bfa021282269d306e03604567 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Wed, 27 Mar 2019 20:09:47 +0100 Subject: [PATCH 2/3] Detect issue related to transmission-common and reinstall it if needed --- scripts/install | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/scripts/install b/scripts/install index d807a74..cdd0548 100644 --- a/scripts/install +++ b/scripts/install @@ -68,6 +68,17 @@ ynh_app_setting_set $app peer_port $peer_port ynh_install_app_dependencies transmission-daemon acl +# Fix a stupid issue which happens sometimes ... +# transmission-common is installed (it's a dependency of +# transmission-daemon) but somehow the files it's supposed +# to add ain't there ... and possibly also the transmission user +# is missing. +# Explicitly reinstalling the package fixes the issue :| +if [ ! -d /usr/share/transmission/ ] +then + ynh_package_install transmission-common --reinstall +fi + #================================================= # NGINX CONFIGURATION #================================================= From ea4545e00ce38e0836ec96e3fdb7754b9641172c Mon Sep 17 00:00:00 2001 From: Maniack Crudelis Date: Wed, 27 Mar 2019 20:32:17 +0100 Subject: [PATCH 3/3] Add transmission-cli and transmission-common to dependencies --- scripts/install | 2 +- scripts/restore | 2 +- scripts/upgrade | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/install b/scripts/install index cdd0548..f5d7e6a 100644 --- a/scripts/install +++ b/scripts/install @@ -66,7 +66,7 @@ ynh_app_setting_set $app peer_port $peer_port # INSTALL TRANSMISSION #================================================= -ynh_install_app_dependencies transmission-daemon acl +ynh_install_app_dependencies transmission-daemon transmission-cli transmission-common acl # Fix a stupid issue which happens sometimes ... # transmission-common is installed (it's a dependency of diff --git a/scripts/restore b/scripts/restore index f10f782..6139280 100644 --- a/scripts/restore +++ b/scripts/restore @@ -60,7 +60,7 @@ yunohost firewall allow Both $peer_port >/dev/null 2>&1 # REINSTALL TRANSMISSION #================================================= -ynh_install_app_dependencies transmission-daemon acl +ynh_install_app_dependencies transmission-daemon transmission-cli transmission-common acl #================================================= # RESTORE TRANSMISSION CONFIGURATION diff --git a/scripts/upgrade b/scripts/upgrade index 43eb9f2..4c07458 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -70,7 +70,7 @@ ynh_add_nginx_config # INSTALL DEPENDENCIES #================================================= -ynh_install_app_dependencies transmission-daemon acl +ynh_install_app_dependencies transmission-daemon transmission-cli transmission-common acl #================================================= # SPECIFIC UPGRADE