From 43bb737bd9f6b3f44cb76213434d50cbbe2db864 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 22 Feb 2024 21:31:15 +0100 Subject: [PATCH 1/3] Upgrade to v10.8.2 https://github.com/gchq/CyberChef/releases/tag/v10.8.2 --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index c90a329..8832cdf 100644 --- a/manifest.toml +++ b/manifest.toml @@ -4,7 +4,7 @@ id = "cyberchef" name = "CyberChef" description.en = "Cyber Swiss Army Knife - toolbox for data analysis" description.fr = "Cyber-couteau suisse - boîte à outils pour l'analyse de données" -version = "10.8.1~ynh3" +version = "10.8.2~ynh1" maintainers = ["oleole39"] @@ -43,8 +43,8 @@ ram.runtime = "20M" [resources.sources] [resources.sources.main] - url = "https://github.com/gchq/CyberChef/releases/download/v10.8.1/CyberChef_v10.8.0.zip" - sha256 = "d0b5e6db16c588bf3c0f856cd63fced730d2c6fb491eee9113256cf5ce935dd4" + url = "https://github.com/gchq/CyberChef/releases/download/v10.8.2/CyberChef_v10.8.2.zip" + sha256 = "123b72659d2994b834f1d777e09f8a431653b0982c536c8cc4c156e1dc882c11" format = "zip" extract = true in_subdir = false From ac1111b1946fb1f54e076259b514b5876dc0412a Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 22 Feb 2024 20:31:18 +0000 Subject: [PATCH 2/3] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 3a2a421..444fb96 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in A simple, intuitive web app for analysing and decoding data without having to deal with complex tools or programming languages. CyberChef encourages both technical and non-technical people to explore data formats, encryption and compression: encode, decode, format data, parse data, encrypt, decrypt, compress data, extract data, perform arithmetic functions against data, etc.. There are around 300 operations in CyberChef allowing you to carry out simple and complex tasks easily. -**Shipped version:** 10.8.1~ynh3 +**Shipped version:** 10.8.2~ynh1 **Demo:** https://gchq.github.io/CyberChef diff --git a/README_fr.md b/README_fr.md index 73bf007..6060bbf 100644 --- a/README_fr.md +++ b/README_fr.md @@ -19,7 +19,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Une application web simple et intuitive pour analyser et décoder des données sans avoir affaire à des outils ou des langages de programmation compliqués. CyberChef s'adresse aussi bien aux utilisateurs expérimentés qu'aux plus novices souhaitant explorer les formats de données, leur chiffrement et leur compression: encoder, décoder, formater, analyser, chiffrer, déchiffrer, compresser, extraire, fonctions arithmétiques, etc.. Il y a en tout près de 300 outils dans CyberChef permettant de réaliser facilement des tâches simples ou complexes. -**Version incluse :** 10.8.1~ynh3 +**Version incluse :** 10.8.2~ynh1 **Démo :** https://gchq.github.io/CyberChef From 8c884c0cdae48770443a43333d5d473c03be1f3d Mon Sep 17 00:00:00 2001 From: oleole39 <59071673+oleole39@users.noreply.github.com> Date: Fri, 23 Feb 2024 01:14:02 +0100 Subject: [PATCH 3/3] restore orginal var name after linter fix --- scripts/change_url | 1 - scripts/install | 4 ++-- scripts/upgrade | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/scripts/change_url b/scripts/change_url index 7df80c9..f89e64a 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -10,7 +10,6 @@ source _common.sh source /usr/share/yunohost/helpers upstream_source_url=$(ynh_read_manifest --manifest_key="resources.sources.main.url") -filename_sourcefile=$(basename $upstream_source_url) index_page=$(basename -s .zip $upstream_source_url).html #this variable will also populate the template tag __INDEX_PAGE__ in nginx.conf #================================================= diff --git a/scripts/install b/scripts/install index 1053fd7..7f79b93 100755 --- a/scripts/install +++ b/scripts/install @@ -10,7 +10,7 @@ source _common.sh source /usr/share/yunohost/helpers upstream_source_url=$(ynh_read_manifest --manifest_key="resources.sources.main.url") -filename_sourcefile=$(basename $upstream_source_url) +source_filename=$(basename $upstream_source_url) index_page=$(basename -s .zip $upstream_source_url).html #this variable will also populate the template tag __INDEX_PAGE__ in nginx.conf #================================================= @@ -21,7 +21,7 @@ index_page=$(basename -s .zip $upstream_source_url).html #this variable will als ynh_script_progression --message="Setting up source files..." --weight=10 ynh_setup_source --dest_dir="$install_dir" -ynh_replace_string --match_string="$filename_sourcefile" --replace_string="$upstream_source_url" --target_file="$install_dir/$index_page" #replace link to local source file with link to upstream source file +ynh_replace_string --match_string="$source_filename" --replace_string="$upstream_source_url" --target_file="$install_dir/$index_page" #replace link to local source file with link to upstream source file chown -R $app:www-data "$install_dir" #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 34207b8..81e0906 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -12,7 +12,7 @@ source /usr/share/yunohost/helpers upgrade_type=$(ynh_check_app_version_changed) upstream_source_url=$(ynh_read_manifest --manifest_key="resources.sources.main.url") -filename_sourcefile=$(basename $upstream_source_url) +source_filename=$(basename $upstream_source_url) index_page=$(basename -s .zip $upstream_source_url).html #this variable will also populate the template tag __INDEX_PAGE__ in nginx.conf #================================================= @@ -25,7 +25,7 @@ if [ "$upgrade_type" == "UPGRADE_APP" ] then ynh_script_progression --message="Upgrading source files..." --weight=10 ynh_setup_source --dest_dir="$install_dir" - ynh_replace_string --match_string="$filename_sourcefile" --replace_string="$upstream_source_url" --target_file="$install_dir/$index_page" #replace link to local source file with link to upstream source file + ynh_replace_string --match_string="$source_filename" --replace_string="$upstream_source_url" --target_file="$install_dir/$index_page" #replace link to local source file with link to upstream source file chown -R $app:www-data "$install_dir" fi