From bd4932c47295ddc40b0d6f0c6c20ad6a3d738db8 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 10 Nov 2020 16:58:19 +0100 Subject: [PATCH] Small typos --- README.md | 7 +++++-- manifest.json | 12 ++++++------ scripts/_common.sh | 16 ++++++++++++++++ scripts/backup | 5 ----- scripts/change_url | 16 ++++++++-------- scripts/install | 6 +++--- scripts/remove | 4 ++-- scripts/restore | 2 +- scripts/upgrade | 6 +++--- 9 files changed, 44 insertions(+), 30 deletions(-) diff --git a/README.md b/README.md index 63bd219..820524b 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,9 @@ [![Integration level](https://dash.yunohost.org/integration/jellyfin.svg)](https://dash.yunohost.org/appci/app/jellyfin) ![](https://ci-apps.yunohost.org/ci/badges/jellyfin.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/jellyfin.maintain.svg) [![Install Jellyfin with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=jellyfin) +> *This package allows you to install REPLACEBYYOURAPP quickly and simply on a YunoHost server. +If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.* + ## Overview Jellyfin enables you to collect, manage, and stream your media. Run the Jellyfin server on your system and gain access to the leading free-software entertainment system, bells and whistles included. @@ -29,8 +32,8 @@ How to configure this app: From an admin panel, a plain file with SSH, or any ot #### Multi-user support - * Are LDAP and HTTP auth supported? - * Can the app be used by multiple users? + * Are LDAP and HTTP auth supported? **No** + * Can the app be used by multiple users? **Yes** #### Supported architectures diff --git a/manifest.json b/manifest.json index 6475faa..1292ae0 100644 --- a/manifest.json +++ b/manifest.json @@ -3,8 +3,8 @@ "id": "jellyfin", "packaging_format": 1, "description": { - "en": "The free software media system that puts you in control of managing and streaming your media.", - "fr": "Le système multimédia libre qui vous donne le contrôle pour gérer et diffuser vos médias." + "en": "Media System that manage and stream your media.", + "fr": "Système multimédia qui gère et diffuse vos médias." }, "version": "10.6.4~ynh1", "url": "https://github.com/jellyfin/jellyfin", @@ -34,8 +34,8 @@ "name": "path", "type": "path", "ask": { - "en": "Choose a path for Jellyfin /jellyfin is accepted", - "fr": "Choisissez un chemin pour Jellyfin /jellyfin est accepté" + "en": "Choose a path for Jellyfin", + "fr": "Choisissez un chemin pour Jellyfin" }, "example": "/jellyfin", "default": "/jellyfin" @@ -44,8 +44,8 @@ "name": "is_public", "type": "boolean", "ask": { - "en": "Is it a public app?", - "fr": "Est-ce une app publique ?" + "en": "Is it a public application?", + "fr": "Est-ce une application publique ?" }, "default": true, "help": { diff --git a/scripts/_common.sh b/scripts/_common.sh index bd66acb..0e17ea6 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -1,3 +1,19 @@ #!/bin/bash +#================================================= +# COMMON VARIABLES +#================================================= + pkg_version="10.6.4-1" + +#================================================= +# PERSONAL HELPERS +#================================================= + +#================================================= +# EXPERIMENTAL HELPERS +#================================================= + +#================================================= +# FUTURE OFFICIAL HELPERS +#================================================= diff --git a/scripts/backup b/scripts/backup index c0119b2..2b24fb0 100644 --- a/scripts/backup +++ b/scripts/backup @@ -36,11 +36,6 @@ domain=$(ynh_app_setting_get --app="$app" --key=domain) #================================================= ynh_print_info --message="Declaring files to be backed up..." -### N.B. : the following 'ynh_backup' calls are only a *declaration* of what needs -### to be backuped and not an actual copy of any file. The actual backup that -### creates and fill the archive with the files happens in the core after this -### script is called. Hence ynh_backups calls takes basically 0 seconds to run. - #================================================= # BACKUP THE APP MAIN DIR #================================================= diff --git a/scripts/change_url b/scripts/change_url index 6abc645..03e8e62 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -34,7 +34,7 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP #================================================= -ynh_script_progression --message="Backing up the app before changing its url (may take a while)..." --weight=10 +ynh_script_progression --message="Backing up the app before changing its URL (may take a while)..." --weight=10 # Backup the current version of the app ynh_backup_before_upgrade @@ -76,23 +76,23 @@ ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app #================================================= # MODIFY URL IN NGINX CONF #================================================= -ynh_script_progression --message="Updating nginx web server configuration..." --weight=1 +ynh_script_progression --message="Updating NGINX web server configuration..." --weight=1 nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf -# Change the path in the nginx config file +# Change the path in the NGINX config file if [ $change_path -eq 1 ] then - # Make a backup of the original nginx config file if modified + # Make a backup of the original NGINX config file if modified ynh_backup_if_checksum_is_different --file="$nginx_conf_path" - # Set global variables for nginx helper + # Set global variables for NGINX helper domain="$old_domain" path_url="$new_path" - # Create a dedicated nginx config + # Create a dedicated NGINX config ynh_add_nginx_config fi -# Change the domain for nginx +# Change the domain for NGINX if [ $change_domain -eq 1 ] then # Delete file checksum for the old conf file location @@ -131,7 +131,7 @@ ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --l #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading nginx web server..." --weight=1 +ynh_script_progression --message="Reloading NGINX web server..." --weight=1 ynh_systemd_action --service_name=nginx --action=reload diff --git a/scripts/install b/scripts/install index d1a8c02..82a5492 100644 --- a/scripts/install +++ b/scripts/install @@ -73,9 +73,9 @@ ynh_install_extra_app_dependencies --repo="https://repo.jellyfin.org/$( awk -F'= #================================================= # NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Configuring nginx web server..." --weight=6 +ynh_script_progression --message="Configuring NGINX web server..." --weight=6 -# Create a dedicated nginx config +# Create a dedicated NGINX config ynh_add_nginx_config #================================================= @@ -151,7 +151,7 @@ fi #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading nginx web server..." --weight=2 +ynh_script_progression --message="Reloading NGINX web server..." --weight=2 ynh_systemd_action --service_name=nginx --action=reload diff --git a/scripts/remove b/scripts/remove index f4aaac5..2fefac4 100644 --- a/scripts/remove +++ b/scripts/remove @@ -26,7 +26,7 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) # REMOVE SERVICE INTEGRATION IN YUNOHOST #================================================= -# Remove the service from the list of services known by Yunohost (added from `yunohost service add`) +# Remove the service from the list of services known by YunoHost (added from `yunohost service add`) if ynh_exec_warn_less yunohost service status $app >/dev/null then ynh_script_progression --message="Removing $app service integration..." --weight=3 @@ -62,7 +62,7 @@ ynh_secure_remove --file="/var/lib/jellyfin" #================================================= # REMOVE NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Removing nginx web server configuration..." --weight=1 +ynh_script_progression --message="Removing NGINX web server configuration..." --weight=1 # Remove the dedicated nginx config ynh_remove_nginx_config diff --git a/scripts/restore b/scripts/restore index c4c9987..9f061d1 100644 --- a/scripts/restore +++ b/scripts/restore @@ -120,7 +120,7 @@ ynh_restore_file --origin_path="/etc/logrotate.d/$app" #================================================= # RELOAD NGINX AND PHP-FPM #================================================= -ynh_script_progression --message="Reloading nginx web server..." --weight=1 +ynh_script_progression --message="Reloading NGINX web server..." --weight=1 ynh_systemd_action --service_name=nginx --action=reload diff --git a/scripts/upgrade b/scripts/upgrade index 0e1dd4d..01d1fc4 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -53,9 +53,9 @@ ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app #================================================= # NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Upgrading nginx web server configuration..." --weight=1 +ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1 -# Create a dedicated nginx config +# Create a dedicated NGINX config ynh_add_nginx_config #================================================= @@ -108,7 +108,7 @@ ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --l #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading nginx web server..." --weight=1 +ynh_script_progression --message="Reloading NGINX web server..." --weight=1 ynh_systemd_action --service_name=nginx --action=reload