From f7225b48d8b2a55d512e89861d1d89776348408d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 28 Aug 2022 13:46:26 +0200 Subject: [PATCH] Testing (#102) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 4.4.0 (#94) * 4.4.0 * Auto-update README * Apply example_ynh * Auto-update README * Update manifest.json * [autopatch] Add Common Platform Enumeration id to `manifest.json` (#99) * Upgrade (#98) * 4.4.0 (#94) * 4.4.0 * Auto-update README * Apply example_ynh * Auto-update README * Update manifest.json Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com> Co-authored-by: yunohost-bot * [autopatch] Add Common Platform Enumeration id to `manifest.json` Co-authored-by: yalh76 Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com> Co-authored-by: Yunohost-Bot <> * Auto-update README * Bullseye (#100) * Auto-update README * PHP shouldn't allow `array(foobar)` to work if foobar is undefined... * Upgrade to bullseye * Auto-update README * Auto-update README * Fix Co-authored-by: yunohost-bot Co-authored-by: Alexandre Aubin * set relative path for --keep opt * 4.5.0 * Auto-update README Co-authored-by: yalh76 Co-authored-by: yunohost-bot Co-authored-by: YunoHost Bot Co-authored-by: Alexandre Aubin --- README.md | 3 ++- README_fr.md | 3 ++- conf/app.src | 4 ++-- conf/config.local.php | 2 +- manifest.json | 9 +++++---- scripts/_common.sh | 4 ++-- scripts/install | 4 ++++ scripts/restore | 4 ++++ scripts/upgrade | 4 ++-- 9 files changed, 24 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index d720fc1..4194252 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,8 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Jirafeau offers the possibility to host and share your files with ease. Choose a file, Jirafeau will provide you with a link with many options. It is possible to protect your links with a password as well as to choose how long the file will be kept on the server. The file and the link will self-destruct after this time. Downloads of transmitted files can be limited to a certain date, and each file can self-destruct after the first download. Jirafeau allows you to configure maximum retention times and maximum size per file. Encryption is available as an option. -**Shipped version:** 4.4.0~ynh2 +**Shipped version:** 4.5.0~ynh1 + **Demo:** https://demo.yunohost.org/jirafeau/ diff --git a/README_fr.md b/README_fr.md index baf69ba..34b60bf 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,8 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Jirafeau offre la possibilité d'héberger et de partager vos fichiers, le tout en toute simplicité. Choisissez un fichier, Jirafeau vous fournira un lien avec beaucoup d'options. Il est possible de protéger vos liens avec mot de passe ainsi que de choisir la durée de rétention du fichier sur le serveur. Le fichier et le lien s'autodétruiront passé ce délai. Les téléchargements des fichiers transmis peuvent être limités à une certaine date, et chaque fichier peut s'autodétruire après le premier téléchargement. Jirafeau permet de configurer les temps maximum de rétention ainsi que la taille maximale par fichier. Le chiffrement est disponible en option. -**Version incluse :** 4.4.0~ynh2 +**Version incluse :** 4.5.0~ynh1 + **Démo :** https://demo.yunohost.org/jirafeau/ diff --git a/conf/app.src b/conf/app.src index fd13c6f..1fc4741 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://gitlab.com/mojo42/Jirafeau/-/archive/4.4.0/Jirafeau-4.4.0.tar.gz -SOURCE_SUM=2afd605756e5d61d621092a1f796be63280d7394a9b61aedf9edbf7308c0cdba +SOURCE_URL=https://gitlab.com/mojo42/Jirafeau/-/archive/4.5.0/Jirafeau-4.5.0.tar.gz +SOURCE_SUM=cc164f086b65c810cefc0eb26bffa6718a12a56ea94b7717d7eba8281d6c66ac SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/config.local.php b/conf/config.local.php index 7259a27..e413d82 100644 --- a/conf/config.local.php +++ b/conf/config.local.php @@ -74,7 +74,7 @@ $cfg['link_name_length'] = 8; * $cfg['upload_password'] = array('psw1'); // One password * $cfg['upload_password'] = array('psw1', 'psw2'); // Two passwords */ -$cfg['upload_password'] = array(__UPLOAD_PASSWORD__); +$cfg['upload_password'] = array('__UPLOAD_PASSWORD__'); /* List of IP allowed to upload a file. * If the list is empty, then there is no upload restriction based on IP. diff --git a/manifest.json b/manifest.json index 80debc4..392464f 100644 --- a/manifest.json +++ b/manifest.json @@ -6,13 +6,14 @@ "en": "Upload a file in a simple way and give a unique link to it", "fr": "Hébergez simplement un fichier et partagez-le avec un lien unique" }, - "version": "4.4.0~ynh2", + "version": "4.5.0~ynh1", "url": "https://gitlab.com/mojo42/Jirafeau", "upstream": { "license": "AGPL-3.0-only", "website": "https://gitlab.com/mojo42/Jirafeau", "demo": "https://demo.yunohost.org/jirafeau/", - "code": "https://gitlab.com/mojo42/Jirafeau" + "code": "https://gitlab.com/mojo42/Jirafeau", + "cpe": "cpe:2.3:a:jirafeau:jirafeau" }, "license": "AGPL-3.0-only", "maintainer": { @@ -20,12 +21,12 @@ "email": "" }, "requirements": { - "yunohost": ">= 4.3.0" + "yunohost": ">= 11.0.9" }, "multi_instance": false, "services": [ "nginx", - "php7.3-fpm" + "php8.0-fpm" ], "arguments": { "install": [ diff --git a/scripts/_common.sh b/scripts/_common.sh index aae521c..eb3783f 100755 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,10 +4,10 @@ # COMMON VARIABLES #================================================= -YNH_PHP_VERSION="7.3" +YNH_PHP_VERSION="8.0" # dependencies used by the app -pkg_dependencies="" +pkg_dependencies="php$YNH_PHP_VERSION-fpm" #================================================= # PERSONAL HELPERS diff --git a/scripts/install b/scripts/install index 151a039..efe088b 100755 --- a/scripts/install +++ b/scripts/install @@ -13,6 +13,10 @@ source /usr/share/yunohost/helpers # MANAGE SCRIPT FAILURE #================================================= +ynh_clean_setup () { + ### Remove this function if there's nothing to clean before calling the remove script. + true +} # Exit if an error occurs during the execution of the script ynh_abort_if_errors diff --git a/scripts/restore b/scripts/restore index 90cc892..c21f1a7 100644 --- a/scripts/restore +++ b/scripts/restore @@ -14,6 +14,10 @@ source /usr/share/yunohost/helpers # MANAGE SCRIPT FAILURE #================================================= +ynh_clean_setup () { + #### Remove this function if there's nothing to clean before calling the remove script. + true +} # Exit if an error occurs during the execution of the script ynh_abort_if_errors diff --git a/scripts/upgrade b/scripts/upgrade index 5dee9ed..28d6fa1 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -22,7 +22,7 @@ admin_user=$(ynh_app_setting_get --app=$app --key=admin) is_public=$(ynh_app_setting_get --app=$app --key=is_public) final_path=$(ynh_app_setting_get --app=$app --key=final_path) upload_password=$(ynh_app_setting_get --app=$app --key=upload_password) -phpversion=$YNH_PHP_VERSION +phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) datadir=$(ynh_app_setting_get --app=$app --key=datadir) #================================================= @@ -91,7 +91,7 @@ then ynh_script_progression --message="Upgrading source files..." --weight=2 # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$final_path" --keep="$final_path/lib/config.local.php" + ynh_setup_source --dest_dir="$final_path" --keep="lib/config.local.php" # Remove the install.php ynh_secure_remove --file=$final_path/install.php