From 276b234cd6428543ee98fda4711b629707fec5b9 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 3 Feb 2024 21:30:42 +0100 Subject: [PATCH 1/3] Upgrade to v10.6.0 Changelog: https://github.com/gchq/CyberChef/releases/tag/v10.6.0 --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index d4e8d76..7c94db2 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.5.2~ynh1" +version = "10.6.0~ynh1" maintainers = ["oleole39"] @@ -43,8 +43,8 @@ ram.runtime = "20M" [resources.sources] [resources.sources.main] - url = "https://github.com/gchq/CyberChef/releases/download/v10.5.2/CyberChef_v10.5.2.zip" - sha256 = "a4d47a313d9e79d08775abfde18a08c32b50b4db8fa52261bfddbb785910d0ef" + url = "https://github.com/gchq/CyberChef/releases/download/v10.6.0/CyberChef_v10.6.0.zip" + sha256 = "d066dbda811071cadc821050f572fa14d7666c0b8af595db2e3833acd0ddc02e" extract = true zip = true in_subdir = false From b52e5dc90408603c7b7e344183040b1fe577cdbe Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 3 Feb 2024 20:30:45 +0000 Subject: [PATCH 2/3] Auto-update README --- README.md | 4 ++-- README_fr.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index b0e1fcd..e18085f 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.5.2~ynh1 +**Shipped version:** 10.6.0~ynh1 **Demo:** https://gchq.github.io/CyberChef @@ -31,7 +31,7 @@ A simple, intuitive web app for analysing and decoding data without having to de * Official user documentation: * Upstream app code repository: -* YunoHost documentation for this app: +* YunoHost Store: * Report a bug: ## Developer info diff --git a/README_fr.md b/README_fr.md index 84c8ffa..26a0c0c 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.5.2~ynh1 +**Version incluse :** 10.6.0~ynh1 **Démo :** https://gchq.github.io/CyberChef @@ -31,7 +31,7 @@ Une application web simple et intuitive pour analyser et décoder des données s * Documentation officielle utilisateur : * Dépôt de code officiel de l’app : -* Documentation YunoHost pour cette app : +* YunoHost Store: * Signaler un bug : ## Informations pour les développeurs From e12e1da6453b628bd31ded51023bdbf28cb0b481 Mon Sep 17 00:00:00 2001 From: oleole39 <59071673+oleole39@users.noreply.github.com> Date: Mon, 5 Feb 2024 05:57:09 +0100 Subject: [PATCH 3/3] fix broken download link in the UI --- scripts/install | 5 +++++ scripts/upgrade | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index cac142f..ef090a2 100755 --- a/scripts/install +++ b/scripts/install @@ -19,7 +19,12 @@ index_page="CyberChef_v${upstream_version}.html" #================================================= ynh_script_progression --message="Setting up source files..." --weight=10 +sources_json=$(cat $YNH_APP_BASEDIR/manifest.toml | toml_to_json | jq ".resources.sources[\"main\"]") +upstream_source_url=$(echo $sources_json | jq -r .url) +source_filename=$(basename $upstream_source_url) +index_html_page=$(basename -s .zip $upstream_source_url).html ynh_setup_source --dest_dir="$install_dir" +sed -i "s|$source_filename|$upstream_source_url|g" "$install_dir/$index_html_page" #replace local link to source file with upstream source file's link chown -R $app:www-data "$install_dir" #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 7b42b27..85e551d 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -23,9 +23,13 @@ index_page="CyberChef_v${upstream_version}.html" if [ "$upgrade_type" == "UPGRADE_APP" ] then ynh_script_progression --message="Upgrading source files..." --weight=10 - - # Download, check integrity, uncompress and patch the source from app.src + sources_json=$(cat $YNH_APP_BASEDIR/manifest.toml | toml_to_json | jq ".resources.sources[\"main\"]") + upstream_source_url=$(echo $sources_json | jq -r .url) + source_filename=$(basename $upstream_source_url) + index_html_page=$(basename -s .zip $upstream_source_url).html ynh_setup_source --dest_dir="$install_dir" + sed -i "s|$source_filename|$upstream_source_url|g" "$install_dir/$index_html_page" #replace local link to source file with upstream source file's link + chown -R $app:www-data "$install_dir" fi chown -R $app:www-data "$install_dir"