diff --git a/issue_template.md b/.github/ISSUE_TEMPLATE.md similarity index 94% rename from issue_template.md rename to .github/ISSUE_TEMPLATE.md index 869d5e4..2729a6b 100644 --- a/issue_template.md +++ b/.github/ISSUE_TEMPLATE.md @@ -8,7 +8,7 @@ about: When creating a bug report, please use the following template to provide 1. *Read this whole template first.* 2. *Determine if you are on the right place:* - *If you were performing an action on the app from the webadmin or the CLI (install, update, backup, restore, change_url...), you are on the right place!* - - *Otherwise, the issue may be due to Jellyfin itself. Refer to its documentation or repository for help.* + - *Otherwise, the issue may be due to the app itself. Refer to its documentation or repository for help.* - *When in doubt, post here and we will figure it out together.* 3. *Delete the italic comments as you write over them below, and remove this guide.* --- @@ -31,7 +31,7 @@ about: When creating a bug report, please use the following template to provide - *If you performed a command from the CLI, the command itself is enough. For example:* ```sh - sudo yunohost app install jellyfin + sudo yunohost app install the_app ``` - *If you used the webadmin, please perform the equivalent command from the CLI first.* - *If the error occurs in your browser, explain what you did:* diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 0000000..ef70e18 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,16 @@ +## Problem + +- *Description of why you made this PR* + +## Solution + +- *And how do you fix that problem* + +## PR Status + +- [ ] Code finished and ready to be reviewed/tested +- [ ] The fix/enhancement were manually tested (if applicable) + +## Automatic tests + +Automatic tests can be triggered on https://ci-apps-dev.yunohost.org/ *after creating the PR*, by commenting "!testme", "!gogogadgetoci" or "By the power of systemd, I invoke The Great App CI to test this Pull Request!". (N.B. : for this to work you need to be a member of the Yunohost-Apps organization) diff --git a/README.md b/README.md index 64cec42..713ffe0 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Media System that manage and stream your media. -**Shipped version:** 10.7.6~ynh1 +**Shipped version:** 10.7.7~ynh1 **Demo:** https://demo.jellyfin.org/stable/web/index.html diff --git a/README_fr.md b/README_fr.md index 4a8f2be..4d0183c 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Système multimédia qui gère et diffuse vos médias. -**Version incluse :** 10.7.6~ynh1 +**Version incluse :** 10.7.7~ynh1 **Démo :** https://demo.jellyfin.org/stable/web/index.html diff --git a/check_process b/check_process index 5f263c4..c1fd17c 100644 --- a/check_process +++ b/check_process @@ -26,7 +26,10 @@ #upgrade=1 from_commit=5478712c0ca7683503bc1b50cfafe81ea508065e # 10.7.0~ynh1 #upgrade=1 from_commit=63ab03ab79cc088a52b8a36fb4fdf5918bf0e14b - upgrade=1 from_commit=8ed403b30a8d3e61e2d3bf5bc8d3f4cae1ed80b6 + # 10.7.5~ynh1 + #upgrade=1 from_commit=8ed403b30a8d3e61e2d3bf5bc8d3f4cae1ed80b6 + # 10.7.6~ynh1 + upgrade=1 from_commit=227b2cb8661b59ba391802637d0893976ffb6dd4 backup_restore=1 multi_instance=0 port_already_use=0 @@ -45,3 +48,5 @@ Notification=none name=10.7.0~ynh1 ; commit=8ed403b30a8d3e61e2d3bf5bc8d3f4cae1ed80b6 name=10.7.5~ynh1 + ; commit=227b2cb8661b59ba391802637d0893976ffb6dd4 + name=10.7.6~ynh1 diff --git a/conf/ldap.src b/conf/ldap.src index 618a43c..cb0025b 100644 --- a/conf/ldap.src +++ b/conf/ldap.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://repo.jellyfin.org/releases/plugin/ldap-authentication/ldap-authentication_10.0.0.0.zip -SOURCE_SUM=A261DD2F9F448839BC24D4DDC0996007F72517E04EEA8C78C45AEF217DD82D22 +SOURCE_URL=https://repo.jellyfin.org/releases/plugin/ldap-authentication/ldap-authentication_12.0.0.0.zip +SOURCE_SUM=e3ef05fdb0cce145504a34595aefe568e47964e981017d9ccb87f39e58fff861 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=false diff --git a/conf/ldap.src.default b/conf/ldap.src.default new file mode 100644 index 0000000..ed6b326 --- /dev/null +++ b/conf/ldap.src.default @@ -0,0 +1,7 @@ +SOURCE_URL=https://repo.jellyfin.org/releases/plugin/ldap-authentication/ldap-authentication___LDAP_PKG_VERSION__.zip +SOURCE_SUM=none +SOURCE_SUM_PRG=sha256sum +SOURCE_FORMAT=zip +SOURCE_IN_SUBDIR=false +SOURCE_FILENAME= +SOURCE_EXTRACT=true diff --git a/conf/server.amd64.src b/conf/server.amd64.src index 9dbcafe..bbf422f 100644 --- a/conf/server.amd64.src +++ b/conf/server.amd64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/stable/server/10.7.6/jellyfin-server_10.7.6-1_amd64.deb -SOURCE_SUM=d4f196e7082f80edc9167975a627b3cb23e922b086c5d695c1b747875d2f5888 +SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/stable/server/10.7.7/jellyfin-server_10.7.7-1_amd64.deb +SOURCE_SUM=938c8be07e2d183b4ee23a0f01f78d140ecb7f58aadc7c0a6105b2e4382c7a4e SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=deb SOURCE_IN_SUBDIR=false diff --git a/conf/server.arm64.src b/conf/server.arm64.src index 92da3a6..46a191e 100644 --- a/conf/server.arm64.src +++ b/conf/server.arm64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/stable/server/10.7.6/jellyfin-server_10.7.6-1_arm64.deb -SOURCE_SUM=d6e93f138f5c7583068c0421a6af27d30c7b970ca4c6d62ed9801c57128af5bb +SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/stable/server/10.7.7/jellyfin-server_10.7.7-1_arm64.deb +SOURCE_SUM=0c42e615382fa567d8e274e77a65632f878680536eaf2bd77fb13a09dc59ada9 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=deb SOURCE_IN_SUBDIR=false diff --git a/conf/server.armhf.src b/conf/server.armhf.src index 4395dbf..1968dd0 100644 --- a/conf/server.armhf.src +++ b/conf/server.armhf.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/stable/server/10.7.6/jellyfin-server_10.7.6-1_armhf.deb -SOURCE_SUM=d438b9e04b5ee6cc53a5d5b6418bec818c9eb8e20f469daaca1cc27327e5f96a +SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/stable/server/10.7.7/jellyfin-server_10.7.7-1_armhf.deb +SOURCE_SUM=685931c972ad044fbdc2ccbea07a5aaf75f93e99562ea799cd6e5a7ac4bdb0cf SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=deb SOURCE_IN_SUBDIR=false diff --git a/conf/web.amd64.src b/conf/web.amd64.src index 1a45eba..25cac6c 100644 --- a/conf/web.amd64.src +++ b/conf/web.amd64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/stable/web/10.7.6/jellyfin-web_10.7.6-1_all.deb -SOURCE_SUM=4c2741f029da19b028c2a66559df33ef128065a97fc4187065a7497e61998ff5 +SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/stable/web/10.7.7/jellyfin-web_10.7.7-1_all.deb +SOURCE_SUM=ca06cc1be55cb0393de9cd002e5cd422b7746c68341125b8f4c18907c59647c8 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=deb SOURCE_IN_SUBDIR=false diff --git a/conf/web.arm64.src b/conf/web.arm64.src index 1a45eba..25cac6c 100644 --- a/conf/web.arm64.src +++ b/conf/web.arm64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/stable/web/10.7.6/jellyfin-web_10.7.6-1_all.deb -SOURCE_SUM=4c2741f029da19b028c2a66559df33ef128065a97fc4187065a7497e61998ff5 +SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/stable/web/10.7.7/jellyfin-web_10.7.7-1_all.deb +SOURCE_SUM=ca06cc1be55cb0393de9cd002e5cd422b7746c68341125b8f4c18907c59647c8 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=deb SOURCE_IN_SUBDIR=false diff --git a/conf/web.armhf.src b/conf/web.armhf.src index 1a45eba..25cac6c 100644 --- a/conf/web.armhf.src +++ b/conf/web.armhf.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/stable/web/10.7.6/jellyfin-web_10.7.6-1_all.deb -SOURCE_SUM=4c2741f029da19b028c2a66559df33ef128065a97fc4187065a7497e61998ff5 +SOURCE_URL=https://repo.jellyfin.org/releases/server/debian/versions/stable/web/10.7.7/jellyfin-web_10.7.7-1_all.deb +SOURCE_SUM=ca06cc1be55cb0393de9cd002e5cd422b7746c68341125b8f4c18907c59647c8 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=deb SOURCE_IN_SUBDIR=false diff --git a/manifest.json b/manifest.json index 97198a7..6957392 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Media System that manage and stream your media.", "fr": "Système multimédia qui gère et diffuse vos médias." }, - "version": "10.7.6~ynh1", + "version": "10.7.7~ynh1", "url": "https://jellyfin.org", "upstream": { "license": "GPL-2.0-only", diff --git a/pull_request_template.md b/pull_request_template.md deleted file mode 100644 index 6c28fc5..0000000 --- a/pull_request_template.md +++ /dev/null @@ -1,16 +0,0 @@ -## Problem -- *Description of why you made this PR* - -## Solution -- *And how do you fix that problem* - -## PR Status -- [ ] Code finished. -- [ ] Tested with Package_check. -- [ ] Fix or enhancement tested. -- [ ] Upgrade from last version tested. -- [ ] Can be reviewed and tested. - -## Package_check results ---- -* An automatic package_check will be launch at https://ci-apps-dev.yunohost.org/, when you add a specific comment to your Pull Request: "!testme", "!gogogadgetoci" or "By the power of systemd, I invoke The Great App CI to test this Pull Request!"* diff --git a/scripts/_common.sh b/scripts/_common.sh index fba2b1d..2995370 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,10 +5,11 @@ #================================================= debian=$(lsb_release --codename --short) -pkg_version="10.7.6-1" +pkg_version="10.7.7-1" version=$(echo "$pkg_version" | cut -d '-' -f 1) ffmpeg_pkg_version="4.3.2-1" +ldap_pkg_version="12.0.0.0" architecture=$(dpkg --print-architecture) diff --git a/scripts/restore b/scripts/restore index b21afa4..b2e9f84 100644 --- a/scripts/restore +++ b/scripts/restore @@ -38,8 +38,6 @@ discovery=$(ynh_app_setting_get --app=$app --key=discovery) #================================================= ynh_script_progression --message="Validating restoration parameters..." --weight=2 -ynh_webpath_available --domain=$domain --path_url=$path_url \ - || ynh_die --message="Path not available: ${domain}${path_url}" test ! -d $final_path \ || ynh_die --message="There is already a directory: $final_path " test ! -d $config_path \ diff --git a/scripts/update_version.sh b/scripts/update_version.sh index a4f2c7c..cc07c74 100755 --- a/scripts/update_version.sh +++ b/scripts/update_version.sh @@ -45,10 +45,6 @@ prepare_source () { # Create the temporary directory tempdir="$(mktemp -d)" - official_checksum_url=$(grep "SOURCE_SUM=" "$destination" | cut -d "=" -f 2) - official_checksum=$(curl -L -s "${official_checksum_url}" | cut -d ' ' -f 1) - echo $official_checksum - url=$(grep "SOURCE_URL=" "$destination" | cut -d "=" -f 2) echo $url filename=${url##*/} @@ -58,7 +54,13 @@ prepare_source () { ynh_secure_remove $tempdir - if [[ "$official_checksum" != "$checksum" ]]; then + official_checksum_url=$(grep "SOURCE_SUM=" "$destination" | cut -d "=" -f 2) + if [[ "$official_checksum_url" != "none" ]]; then + official_checksum=$(curl -L -s "${official_checksum_url}" | cut -d ' ' -f 1) + echo $official_checksum + fi + + if [[ "$official_checksum_url" != "none" && "$official_checksum" != "$checksum" ]]; then echo "Downloaded file checksum ($checksum) does not match official checksum ($official_checksum)" exit 1 else @@ -74,7 +76,9 @@ for architecture in "${architectures[@]}"; do prepare_source --template="../conf/server.src.default" --destination="../conf/server.$architecture.src" --architecture="$architecture" done +prepare_source --template="../conf/ldap.src.default" --destination="../conf/ldap.src" + sed -i "s# \"version\": \".*# \"version\": \"${version}\~ynh1\",#" ../manifest.json -git add . -git commit _common.sh ../manifest.json ../conf/ffmpeg.*.src ../conf/web.*.src ../conf/server.*.src -m "Upgrade to v$version" +git add _common.sh ../manifest.json ../conf/ffmpeg.*.src ../conf/web.*.src ../conf/server.*.src ../conf/ldap.src +git commit -m "Upgrade to v$version" diff --git a/scripts/upgrade b/scripts/upgrade index 6b0a62a..ce19637 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -202,15 +202,11 @@ ynh_exec_fully_quiet ynh_replace_string --match_string="\"Default\": \"Informati #================================================= # INSTALL LDAP PLUGIN #================================================= +ynh_script_progression --message="Installing LDAP plugin..." --weight=2 -# Install it only if the plugin directory does not exist -if [ ! -e "/var/lib/jellyfin/plugins/LDAP Authentication" ]; then - ynh_script_progression --message="Installing LDAP plugin..." --weight=2 - - ynh_setup_source --dest_dir="/var/lib/jellyfin/plugins/LDAP Authentication" --source_id=ldap - mkdir -p /var/lib/jellyfin/plugins/configurations/ - ynh_add_config --template="../conf/LDAP-Auth.xml" --destination="/var/lib/jellyfin/plugins/configurations/LDAP-Auth.xml" -fi +ynh_setup_source --dest_dir="/var/lib/jellyfin/plugins/LDAP Authentication" --source_id=ldap +mkdir -p /var/lib/jellyfin/plugins/configurations/ +ynh_add_config --template="../conf/LDAP-Auth.xml" --destination="/var/lib/jellyfin/plugins/configurations/LDAP-Auth.xml" #================================================= # GENERIC FINALIZATION