From a42fd33789d773ca1bee424dc6f7334f6b977434 Mon Sep 17 00:00:00 2001 From: Krakinou Date: Sun, 9 May 2021 10:32:51 +0200 Subject: [PATCH 1/4] Upgrade to 10.5.0 --- README.md | 2 +- README_fr.md | 4 ++-- check_process | 2 +- conf/app.src.default | 2 +- scripts/_common.sh | 12 ++++++------ 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 2fa2fb9..7d05eff 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ It was originally based on PS3 Media Server by shagrath, and started by SubJunk, Upstream source code may be found [here](https://github.com/UniversalMediaServer/UniversalMediaServer) -**Shipped version:** 10.4.1 +**Shipped version:** 10.5.0 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 0be8076..b29221e 100644 --- a/README_fr.md +++ b/README_fr.md @@ -17,9 +17,9 @@ Universal Media Server est un serveur DLNA, UPnp et HTTP/S libre supportant tous Le programme stream ou transcode beaucoup de formats différents avec peu ou pas de configuration. Il utilise by FFmpeg, MediaInfo, OpenSubtitles, Crowdin, MEncoder, tsMuxeR, AviSynth, VLC et d'autres, qiu'il combine pour permettre d'exploiter une grande variété de format. Il était originellement basé sur PS3 Media Server de shagrath, et a été lancé par SubJunk, un développeur officiel de PMS, pour assurer la plus grande stabilité et compatiblité. -Le code du programme peut ^etre consulté [ici]](https://github.com/UniversalMediaServer/UniversalMediaServer) +Le code du programme peut être consulté [ici]](https://github.com/UniversalMediaServer/UniversalMediaServer) -**Version incluse :** 10.4.1 +**Version incluse :** 10.5.0 ## Captures d'écran diff --git a/check_process b/check_process index 7c7beb6..bdbe014 100644 --- a/check_process +++ b/check_process @@ -13,7 +13,7 @@ setup_private=1 setup_public=1 upgrade=1 -# upgrade=0 from_commit=CommitHash + upgrade=1 from_commit=6f1647d8038918a0372f68e060ed2fb36a926090 backup_restore=1 multi_instance=0 port_already_use=1 diff --git a/conf/app.src.default b/conf/app.src.default index 1ee9019..eb7025d 100644 --- a/conf/app.src.default +++ b/conf/app.src.default @@ -1,4 +1,4 @@ -SOURCE_URL=https://github.com/UniversalMediaServer/UniversalMediaServer/releases/download/10.4.1/UMS-10.4.1-__MACH__.tgz +SOURCE_URL=https://github.com/UniversalMediaServer/UniversalMediaServer/releases/download/10.5.0/UMS-10.5.0-__MACH__.tgz SOURCE_SUM=__SHA256_SUM__ SOURCE_FORMAT=tgz SOURCE_SUM_PRG=sha256sum diff --git a/scripts/_common.sh b/scripts/_common.sh index 79c1736..e244403 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -10,24 +10,24 @@ pkg_dependencies="mediainfo dcraw p7zip" MACH=`uname -m` case "$MACH" in "armv6l" ) MACH="armel" - SHA256=1051fd725ff2c8da469fd9c0d1331e3c8ec031194303a8c79f7fad80c70e4a5e + SHA256=751b4e17078d9dc6b7e76d94e2c8d23be7e3ccec5ed5424ec2f03cd9eec392eb #for some reason, jre is not in the tarball pkg_dependencies="$pkg_dependencies openjdk-8-jre" ;; "armv7l" ) if [ $(dpkg --print-architecture) = "armhf" ]; then MACH="armhf" - SHA256=194686fb5af695112485780b2cb89af2ec7cb675f166ff2717c7fc66eac958c0 + SHA256=7a128510ac3d24040a9e18e973aeed92a4014bab4cfb39a8fba77e4e05a6695a pkg_dependencies="$pkg_dependencies openjdk-8-jre" else MACH="armel" - SHA256=1051fd725ff2c8da469fd9c0d1331e3c8ec031194303a8c79f7fad80c70e4a5e + SHA256=751b4e17078d9dc6b7e76d94e2c8d23be7e3ccec5ed5424ec2f03cd9eec392eb pkg_dependencies="$pkg_dependencies openjdk-8-jre" fi ;; "armv8l" ) MACH="arm64" - SHA256=179ad2ff3800001b8e51d21776426d88c72c1ca1e4030363f3e9b4820d0919cc ;; + SHA256=995f43a00316d53b99bc2e87ed781bd61f826b58fd865bdcf5f60d47e0a2e0ee ;; "x86_64" ) MACH="x86_64" - SHA256=7fbed13a5c5f8eb01f6f1b4815c73fb4b21b81b4affff29b5185715fa76f841b ;; + SHA256=a023b36d099090ac52253882031e45ebed519a9d7937cbd1d9c2d0fcf45eb251 ;; * ) MACH="x86" - SHA256=ec8e67e3b03300857116ebb9ddfe1bd938b506e9ba603df02f3c8d38bf9bb7be ;; + SHA256=e48f287493fe264fab204bafbd2c916da341c647ec7cebba3c66083014f8e8c2 ;; esac #================================================= From 43f1c6f7efef5fa2ee62432a2f4b6c5d6fec719d Mon Sep 17 00:00:00 2001 From: Krakinou Date: Sun, 9 May 2021 11:54:20 +0200 Subject: [PATCH 2/4] version bump --- manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index 0bb8a3f..8b74043 100644 --- a/manifest.json +++ b/manifest.json @@ -6,9 +6,9 @@ "en": "A DLNA, UPnP and HTTP(S) Media Server", "fr": "Un Serveur Multimedia DLNA, UPnP et HTTP(S)" }, - "version": "10.4.1~ynh1", + "version": "10.5.0~ynh1", "url": "www.universalmediaserver.com", - "license": "GPL-2.0-or-later", + "license": "GPL-3.0-or-later", "maintainer": { "name": "Krakinou", "email": "misterl56@hotmail.com" From ea98c6fe563ffdc5ed4feb823f033462f6ef5e08 Mon Sep 17 00:00:00 2001 From: Krakinou Date: Sun, 9 May 2021 11:58:41 +0200 Subject: [PATCH 3/4] Remove --time --- scripts/change_url | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/change_url b/scripts/change_url index 7515ed0..37417a1 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -26,7 +26,7 @@ app=$YNH_APP_INSTANCE_NAME #================================================= # LOAD SETTINGS #================================================= -ynh_script_progression --message="Loading installation settings..." --time --weight=1 +ynh_script_progression --message="Loading installation settings..." --weight=1 # Needed for helper "ynh_add_nginx_config" final_path=$(ynh_app_setting_get --app=$app --key=final_path) @@ -40,7 +40,7 @@ port_web=$(ynh_app_setting_get --app=$app --key=port_web) #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP #================================================= -ynh_script_progression --message="Backing up the app before changing its URL (may take a while)..." --time --weight=1 +ynh_script_progression --message="Backing up the app before changing its URL (may take a while)..." --weight=7 # Backup the current version of the app ynh_backup_before_upgrade @@ -75,14 +75,14 @@ fi #================================================= # STOP SYSTEMD SERVICE #================================================= -ynh_script_progression --message="Stopping a systemd service..." --time --weight=1 +ynh_script_progression --message="Stopping a systemd service..." --weight=2 ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app/$app.log" #================================================= # MODIFY URL IN NGINX CONF #================================================= -ynh_script_progression --message="Updating NGINX web server configuration..." --time --weight=1 +ynh_script_progression --message="Updating NGINX web server configuration..." --weight=2 nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf @@ -119,14 +119,14 @@ fi #================================================= # START SYSTEMD SERVICE #================================================= -ynh_script_progression --message="Starting a systemd service..." --time --weight=1 +ynh_script_progression --message="Starting a systemd service..." --weight=2 ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading NGINX web server..." --time --weight=1 +ynh_script_progression --message="Reloading NGINX web server..." --weight=2 ynh_systemd_action --service_name=nginx --action=reload @@ -134,4 +134,4 @@ ynh_systemd_action --service_name=nginx --action=reload # END OF SCRIPT #================================================= -ynh_script_progression --message="Change of URL completed for $app" --time --last +ynh_script_progression --message="Change of URL completed for $app" --last From ef5bb4a4b2befe8407e9a0395a5c4c38f2d7fd3d Mon Sep 17 00:00:00 2001 From: Krakinou Date: Sun, 9 May 2021 12:26:29 +0200 Subject: [PATCH 4/4] secure_remove instead of rm --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 2b14cea..2428f67 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -77,7 +77,7 @@ then ynh_replace_string --match_string="__SHA256_SUM__" --replace_string="$SHA256" --target_file="../conf/app.src" ynh_setup_source --dest_dir="$final_path" tar xfvz $final_path/app.tgz --strip-component=1 --directory=$final_path/ - rm $final_path/app.tgz + ynh_secure_remove $final_path/app.tgz fi #=================================================