1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/shaarli_ynh.git synced 2024-09-03 20:26:10 +02:00
Fix #67 #65
This commit is contained in:
lapineige 2021-03-14 21:35:44 +01:00 committed by GitHub
parent 037f154118
commit 183728c378
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions

View file

@ -6,11 +6,11 @@
"en": "The personal, minimalist, super-fast, no-database delicious clone", "en": "The personal, minimalist, super-fast, no-database delicious clone",
"fr": "Clone de delicious, rapide, simple et sans base de données." "fr": "Clone de delicious, rapide, simple et sans base de données."
}, },
"version": "0.12.1~ynh1", "version": "0.12.1~ynh2",
"url": "https://github.com/shaarli/Shaarli", "url": "https://github.com/shaarli/Shaarli",
"license": "MIT", "license": "MIT",
"maintainer": { "maintainer": {
"name": "Lapineige et rafi59", "name": "lapineige et rafi59",
"email": "rafi59_dev@srvmaison.fr.nf", "email": "rafi59_dev@srvmaison.fr.nf",
"url": "" "url": ""
}, },

View file

@ -65,7 +65,7 @@ ynh_abort_if_errors
# DOWNLOAD, CHECK AND UNPACK SOURCE # DOWNLOAD, CHECK AND UNPACK SOURCE
#================================================= #=================================================
if [ "$upgrade_type" == "UPGRADE_APP" ] if [ "$upgrade_type" == "UPGRADE_APP" ] || [ "$upgrade_type" == "UPGRADE_FORCED" ] # we should do that during a force upgrade too (as it could lead to a version upgrade for instance)
then then
ynh_script_progression --message="Upgrading source files..." ynh_script_progression --message="Upgrading source files..."
@ -83,7 +83,7 @@ then
ynh_setup_source --dest_dir="$final_path" ynh_setup_source --dest_dir="$final_path"
cp -a "$tmpdir/data" "$final_path/" cp -a "$tmpdir/data" "$final_path/"
cp -a "$tmpdir/tpl" "$final_path/" cp -a -n "$tmpdir/tpl" "$final_path/" # copy without erasing existing templates (from official source)
# Remove the tmp directory securely # Remove the tmp directory securely
ynh_secure_remove --file="$tmpdir" ynh_secure_remove --file="$tmpdir"