1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/cyberchef_ynh.git synced 2024-09-03 18:16:31 +02:00

Merge branch 'testing'

update to v.10.8.1 and improve parsing of version number to make future updates more resilient to breakage
This commit is contained in:
oleole39 2024-02-19 16:01:25 +01:00
commit 035f4bd59e
5 changed files with 13 additions and 19 deletions

View file

@ -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.7.0~ynh1
**Shipped version:** 10.8.1~ynh1
**Demo:** https://gchq.github.io/CyberChef

View file

@ -19,7 +19,7 @@ Si vous navez 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.7.0~ynh1
**Version incluse :** 10.8.1~ynh1
**Démo :** https://gchq.github.io/CyberChef

View file

@ -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.7.0~ynh1"
version = "10.8.1~ynh1"
maintainers = ["oleole39"]
@ -43,8 +43,8 @@ ram.runtime = "20M"
[resources.sources]
[resources.sources.main]
url = "https://github.com/gchq/CyberChef/releases/download/v10.7.0/CyberChef_v10.7.0.zip"
sha256 = "8dd5672fed8019a7331d045b84f1d7c626a7f450f6624dca99fccbb951ee2e48"
url = "https://github.com/gchq/CyberChef/releases/download/v10.8.1/CyberChef_v10.8.0.zip"
sha256 = "d0b5e6db16c588bf3c0f856cd63fced730d2c6fb491eee9113256cf5ce935dd4"
format = "zip"
extract = true
in_subdir = false

View file

@ -9,8 +9,9 @@
source _common.sh
source /usr/share/yunohost/helpers
upstream_version=$(ynh_app_upstream_version)
index_page="CyberChef_v${upstream_version}.html"
upstream_source_url=$(ynh_read_manifest --manifest_key="resources.sources.main.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
#=================================================
# APP "BUILD" (DEPLOYING SOURCES, VENV, COMPILING ETC)
@ -19,12 +20,8 @@ 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
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
chown -R $app:www-data "$install_dir"
#=================================================

View file

@ -11,8 +11,9 @@ source /usr/share/yunohost/helpers
upgrade_type=$(ynh_check_app_version_changed)
upstream_version=$(ynh_app_upstream_version)
index_page="CyberChef_v${upstream_version}.html"
upstream_source_url=$(ynh_read_manifest --manifest_key="resources.sources.main.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
#=================================================
# "REBUILD" THE APP (DEPLOY NEW SOURCES, RERUN NPM BUILD, ETC...)
@ -23,12 +24,8 @@ index_page="CyberChef_v${upstream_version}.html"
if [ "$upgrade_type" == "UPGRADE_APP" ]
then
ynh_script_progression --message="Upgrading 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
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
chown -R $app:www-data "$install_dir"
fi