diff --git a/check_process b/check_process index bdf304d..a402d51 100644 --- a/check_process +++ b/check_process @@ -2,7 +2,7 @@ ; Manifest domain="domain.tld" path="/path" - is_public="Yes" + is_public=1 ; Checks pkg_linter=1 setup_sub_dir=1 diff --git a/conf/app.src b/conf/app.src index a7a3418..3962b8b 100644 --- a/conf/app.src +++ b/conf/app.src @@ -3,4 +3,3 @@ SOURCE_SUM=79e743f874eef952e8e0ca5f7a48d04872d7671a9c0581ce188fc42ee11bdf72 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true -SOURCE_FILENAME= diff --git a/Screenshot-20euros.jpg b/doc/screenshots/Screenshot-20euros.jpg similarity index 100% rename from Screenshot-20euros.jpg rename to doc/screenshots/Screenshot-20euros.jpg diff --git a/manifest.json b/manifest.json index dfb7bc0..6a98182 100644 --- a/manifest.json +++ b/manifest.json @@ -3,11 +3,16 @@ "id": "20euros", "packaging_format": 1, "description": { - "en": "A 2048 variant with Euro coins and notes.", - "fr": "Une variante 2048 avec pièces et billets en euros." + "en": "2048 variant with Euro coins and notes", + "fr": "Variante de 2048 avec pièces et billets en euros" }, "version": "1.0~ynh4", "url": "https://github.com/jatekos101/20euros", + "upstream": { + "license": "MIT", + "website": "https://github.com/jatekos101/20euros", + "code": "https://github.com/jatekos101/20euros" + }, "license": "MIT", "maintainer": { "name": "eric_G", @@ -24,8 +29,7 @@ "install" : [ { "name": "domain", - "type": "domain", - "example": "domain.org" + "type": "domain" }, { "name": "path", diff --git a/scripts/upgrade b/scripts/upgrade index 72500ca..46e651f 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -25,6 +25,20 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) upgrade_type=$(ynh_check_app_version_changed) +#================================================= +# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP +#================================================= +ynh_script_progression --message="Backing up $app before upgrading (may take a while)..." --weight=3 + +# Backup the current version of the app +ynh_backup_before_upgrade +ynh_clean_setup () { + # restore it if the upgrade fails + ynh_restore_upgradebackup +} +# Exit if an error occurs during the execution of the script +ynh_abort_if_errors + #================================================= # ENSURE DOWNWARD COMPATIBILITY #================================================= @@ -43,20 +57,6 @@ if ynh_legacy_permissions_exists; then ynh_app_setting_delete --app=$app --key=is_public fi -#================================================= -# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP -#================================================= -ynh_script_progression --message="Backing up $app before upgrading (may take a while)..." --weight=3 - -# Backup the current version of the app -ynh_backup_before_upgrade -ynh_clean_setup () { - # restore it if the upgrade fails - ynh_restore_upgradebackup -} -# Exit if an error occurs during the execution of the script -ynh_abort_if_errors - #================================================= # CREATE DEDICATED USER #=================================================