From 460df64d3e6f737f7d545aabacad48a931a52d4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 28 May 2023 16:55:43 +0200 Subject: [PATCH] fix --- manifest.toml | 4 +--- scripts/_common.sh | 2 -- scripts/upgrade | 1 + 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/manifest.toml b/manifest.toml index 6a1fd1a..8da29a7 100644 --- a/manifest.toml +++ b/manifest.toml @@ -14,11 +14,9 @@ license = "GPL-3.0-or-later" website = "https://libreto.net" demo = "https://libreto.net" code = "https://github.com/Ventricule/libreto" -cpe = "???" # FIXME: optional but recommended if relevant, this is meant to contain the Common Platform Enumeration, which is sort of a standard id for applications defined by the NIST. In particular, Yunohost may use this is in the future to easily track CVE (=security reports) related to apps. The CPE may be obtained by searching here: https://nvd.nist.gov/products/cpe/search. For example, for Nextcloud, the CPE is 'cpe:2.3:a:nextcloud:nextcloud' (no need to include the version number) -fund = "???" # FIXME: optional but recommended (or remove if irrelevant / not applicable). This is meant to be an URL where people can financially support this app, especially when its development is based on volunteers and/or financed by its community. YunoHost may later advertise it in the webadmin. [integration] -yunohost = ">= 11.1.15" +yunohost = ">= 11.1.19" architectures = "all" multi_instance = true ldap = false diff --git a/scripts/_common.sh b/scripts/_common.sh index 269ad8f..19e9fc7 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,8 +4,6 @@ # COMMON VARIABLES #================================================= -#REMOVEME? YNH_PHP_VERSION="7.3" - COMMIT="76408f5e98a68156afa47996e670d110a1c6106d" #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 2f7655c..a56d22b 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -32,6 +32,7 @@ then git checkout master git pull --quiet git checkout $COMMIT --quiet + git config --global --add safe.directory $install_dir/libreto/vendor/Markdownify git submodule update --init --recursive --quiet popd fi