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

Merge branch 'master' into testing

This commit is contained in:
ericgaspar 2020-12-14 10:16:46 +01:00
commit 993f54e323
No known key found for this signature in database
GPG key ID: 574F281483054D44
3 changed files with 6 additions and 6 deletions

View file

@ -6,8 +6,8 @@
"en": "Collaborative editor to work on notes written in Markdown", "en": "Collaborative editor to work on notes written in Markdown",
"fr": "Éditeur collaboratif pour travailler sur des notes en Markdown" "fr": "Éditeur collaboratif pour travailler sur des notes en Markdown"
}, },
"version": "1.6.0~ynh5", "version": "1.6.0~ynh6",
"url": "https://github.com/hedgedoc/hedgedoc", "url": "https://github.com/codimd/server",
"license": "AGPL-3.0-only", "license": "AGPL-3.0-only",
"maintainer": { "maintainer": {
"name": "liberodark" "name": "liberodark"

View file

@ -118,7 +118,7 @@ ynh_system_user_create --username=$app --home_dir=$final_path
#============================================== #==============================================
# INSTALL CODIMD # INSTALL CODIMD
#============================================== #==============================================
ynh_script_progression --message="Building CodiMD... (this will take some time and resources!)" --weight=240 ynh_script_progression --message="Building CodiMD... (this will take some time and resources!)" --weight=24
pushd "$final_path" || ynh_die pushd "$final_path" || ynh_die
ynh_use_nodejs ynh_use_nodejs

View file

@ -36,7 +36,7 @@ upgrade_type=$(ynh_check_app_version_changed)
#================================================= #=================================================
# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
#================================================= #=================================================
ynh_script_progression --message="Backing up CodiMD before upgrading (may take a while)..." --weight=120 ynh_script_progression --message="Backing up CodiMD before upgrading (may take a while)..." --weight=20
# Backup the current version of the app # Backup the current version of the app
ynh_backup_before_upgrade ynh_backup_before_upgrade
@ -62,7 +62,7 @@ ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd"
if [ "$upgrade_type" == "UPGRADE_APP" ] if [ "$upgrade_type" == "UPGRADE_APP" ]
then then
ynh_script_progression --message="Upgrading source files..." --weight=160 ynh_script_progression --message="Upgrading source files..." --weight=16
# Create a temporary directory # Create a temporary directory
tmpdir="$(mktemp -d)" tmpdir="$(mktemp -d)"
@ -121,7 +121,7 @@ ynh_system_user_create --username=$app
#============================================== #==============================================
if [ "$upgrade_type" == "UPGRADE_APP" ] if [ "$upgrade_type" == "UPGRADE_APP" ]
then then
ynh_script_progression --message="Building CodiMD... (this will take some time and resources!)" --weight=36 ynh_script_progression --message="Building CodiMD... (this will take some time and resources!)" --weight=16
pushd "$final_path" || ynh_die pushd "$final_path" || ynh_die
ynh_use_nodejs ynh_use_nodejs