1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/svgedit_ynh.git synced 2024-09-03 20:26:24 +02:00

Merge branch 'master' into testing

This commit is contained in:
ericgaspar 2020-12-14 11:03:21 +01:00
commit 79cb37b8da
No known key found for this signature in database
GPG key ID: 574F281483054D44
2 changed files with 10 additions and 6 deletions

View file

@ -7,7 +7,7 @@
"fr": "Édition de SVG en ligne fonctionnent avec tout navigateur moderne." "fr": "Édition de SVG en ligne fonctionnent avec tout navigateur moderne."
}, },
"url": "https://github.com/SVG-Edit/svgedit", "url": "https://github.com/SVG-Edit/svgedit",
"version": "2.8.1~ynh2", "version": "2.8.1~ynh3",
"license": "MIT", "license": "MIT",
"maintainer": { "maintainer": {
"name": "ljf", "name": "ljf",
@ -52,6 +52,10 @@
"en": "Is it a public application?", "en": "Is it a public application?",
"fr": "Est-ce une application publique ?" "fr": "Est-ce une application publique ?"
}, },
"help": {
"en": "If enabled, SVG-edit will be accessible by people who do not have an account. This can be changed later via the webadmin.",
"fr": "Si cette case est cochée, SVG-edit sera accessible aux personnes nayant pas de compte. Vous pourrez changer ceci plus tard via la webadmin."
},
"default": true "default": true
} }
] ]

View file

@ -116,19 +116,19 @@ to_logs() {
} }
ynh_read_json () { ynh_read_json () {
sudo python3 -c "import sys, json;print(json.load(open('$1'))['$2'])" python3 -c "import sys, json;print(json.load(open('$1'))['$2'])"
} }
ynh_configure () { ynh_configure () {
local TEMPLATE=$1 local TEMPLATE=$1
local DEST=$2 local DEST=$2
type j2 2>/dev/null || sudo pip install j2cli type j2 2>/dev/null || pip install j2cli
j2 "${PKG_DIR}/conf/$TEMPLATE.j2" > "${PKG_DIR}/conf/$TEMPLATE" j2 "${PKG_DIR}/conf/$TEMPLATE.j2" > "${PKG_DIR}/conf/$TEMPLATE"
ynh_backup_if_checksum_is_different "$DEST" ynh_backup_if_checksum_is_different "$DEST"
sudo cp "${PKG_DIR}/conf/$TEMPLATE" "$DEST" cp "${PKG_DIR}/conf/$TEMPLATE" "$DEST"
ynh_store_file_checksum "$DEST" ynh_store_file_checksum "$DEST"
sudo chown root: "$DEST" chown root: "$DEST"
} }
@ -139,7 +139,7 @@ ynh_configure () {
# #
# To force an upgrade, even if the package is up to date, # To force an upgrade, even if the package is up to date,
# you have to set the variable YNH_FORCE_UPGRADE before. # you have to set the variable YNH_FORCE_UPGRADE before.
# example: sudo YNH_FORCE_UPGRADE=1 yunohost app upgrade MyApp # example: YNH_FORCE_UPGRADE=1 yunohost app upgrade MyApp
# #
# usage: ynh_abort_if_up_to_date # usage: ynh_abort_if_up_to_date
ynh_abort_if_up_to_date () { ynh_abort_if_up_to_date () {