From 2a2efc339405a5e51c17938ac5d315649607246a Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 19 Feb 2024 19:51:56 +0000 Subject: [PATCH 1/5] 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 8423efd..57dc974 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~ynh1 +**Shipped version:** 10.8.1~ynh2 **Demo:** https://gchq.github.io/CyberChef diff --git a/README_fr.md b/README_fr.md index 9c9cdd1..398e964 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~ynh1 +**Version incluse :** 10.8.1~ynh2 **Démo :** https://gchq.github.io/CyberChef From 3f941d38455338482abed9516162c19cda42b991 Mon Sep 17 00:00:00 2001 From: oleole39 <59071673+oleole39@users.noreply.github.com> Date: Mon, 19 Feb 2024 21:08:23 +0100 Subject: [PATCH 2/5] fix linter warning about sed & update version number --- README.md | 4 ++-- README_fr.md | 4 ++-- manifest.toml | 2 +- scripts/install | 2 +- scripts/upgrade | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 57dc974..017d72e 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~ynh2 +**Shipped version:** 10.8.1~ynh3 **Demo:** https://gchq.github.io/CyberChef @@ -46,4 +46,4 @@ or sudo yunohost app upgrade cyberchef -u https://github.com/YunoHost-Apps/cyberchef_ynh/tree/testing --debug ``` -**More info regarding app packaging:** \ No newline at end of file +**More info regarding app packaging:** diff --git a/README_fr.md b/README_fr.md index 398e964..a106776 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~ynh2 +**Version incluse :** 10.8.1~ynh3 **Démo :** https://gchq.github.io/CyberChef @@ -46,4 +46,4 @@ ou sudo yunohost app upgrade cyberchef -u https://github.com/YunoHost-Apps/cyberchef_ynh/tree/testing --debug ``` -**Plus d’infos sur le packaging d’applications :** \ No newline at end of file +**Plus d’infos sur le packaging d’applications :** diff --git a/manifest.toml b/manifest.toml index 64018da..c90a329 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~ynh2" +version = "10.8.1~ynh3" maintainers = ["oleole39"] diff --git a/scripts/install b/scripts/install index bf79d6d..7f79b93 100755 --- a/scripts/install +++ b/scripts/install @@ -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" -sed -i "s|$source_filename|$upstream_source_url|g" "$install_dir/$index_page" #replace local link to source file with upstream source file's link +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 a3931ea..81e0906 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -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" - sed -i "s|$source_filename|$upstream_source_url|g" "$install_dir/$index_page" #replace local link to source file with upstream source file's link + 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 From ab73b4c674f8c149482a7a7f0c899db6d75dbc7c Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 19 Feb 2024 20:12:57 +0000 Subject: [PATCH 3/5] 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 017d72e..3a2a421 100644 --- a/README.md +++ b/README.md @@ -46,4 +46,4 @@ or sudo yunohost app upgrade cyberchef -u https://github.com/YunoHost-Apps/cyberchef_ynh/tree/testing --debug ``` -**More info regarding app packaging:** +**More info regarding app packaging:** \ No newline at end of file diff --git a/README_fr.md b/README_fr.md index a106776..73bf007 100644 --- a/README_fr.md +++ b/README_fr.md @@ -46,4 +46,4 @@ ou sudo yunohost app upgrade cyberchef -u https://github.com/YunoHost-Apps/cyberchef_ynh/tree/testing --debug ``` -**Plus d’infos sur le packaging d’applications :** +**Plus d’infos sur le packaging d’applications :** \ No newline at end of file From 2b7e4a0f47f7461a8e385f9a9f4a91d56beb9f3d Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 19 Feb 2024 20:23:33 +0000 Subject: [PATCH 4/5] 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 017d72e..3a2a421 100644 --- a/README.md +++ b/README.md @@ -46,4 +46,4 @@ or sudo yunohost app upgrade cyberchef -u https://github.com/YunoHost-Apps/cyberchef_ynh/tree/testing --debug ``` -**More info regarding app packaging:** +**More info regarding app packaging:** \ No newline at end of file diff --git a/README_fr.md b/README_fr.md index a106776..73bf007 100644 --- a/README_fr.md +++ b/README_fr.md @@ -46,4 +46,4 @@ ou sudo yunohost app upgrade cyberchef -u https://github.com/YunoHost-Apps/cyberchef_ynh/tree/testing --debug ``` -**Plus d’infos sur le packaging d’applications :** +**Plus d’infos sur le packaging d’applications :** \ No newline at end of file From dfbca6874e2df97f0b9e31c7561927622869b6e2 Mon Sep 17 00:00:00 2001 From: oleole39 <59071673+oleole39@users.noreply.github.com> Date: Mon, 19 Feb 2024 22:29:06 +0100 Subject: [PATCH 5/5] change variable name to circumvent linter bug https://github.com/YunoHost/package_linter/pull/129 --- scripts/change_url | 2 +- scripts/install | 4 ++-- scripts/upgrade | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/change_url b/scripts/change_url index 81e6351..7df80c9 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -10,7 +10,7 @@ source _common.sh source /usr/share/yunohost/helpers upstream_source_url=$(ynh_read_manifest --manifest_key="resources.sources.main.url") -source_filename=$(basename $upstream_source_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 7f79b93..1053fd7 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") -source_filename=$(basename $upstream_source_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 #================================================= @@ -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="$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 +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 chown -R $app:www-data "$install_dir" #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 81e0906..34207b8 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") -source_filename=$(basename $upstream_source_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 #================================================= @@ -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="$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 + 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 chown -R $app:www-data "$install_dir" fi