diff --git a/check_process b/check_process index 9184984..32a11bd 100644 --- a/check_process +++ b/check_process @@ -17,6 +17,8 @@ setup_private=0 setup_public=0 upgrade=1 + # 5.4.1~ynh2 + upgrade=1 from_commit=bd09fd83cb3f127d242f551786d49202a434c4b2 backup_restore=1 multi_instance=1 incorrect_path=0 diff --git a/conf/app.src b/conf/app.src index 1957d04..3ebd40b 100644 --- a/conf/app.src +++ b/conf/app.src @@ -4,3 +4,4 @@ SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true SOURCE_FILENAME=minetest-5.4.1.tar.gz +SOURCE_EXTRACT=true diff --git a/doc/.gitkeep b/doc/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md new file mode 100644 index 0000000..87d43b3 --- /dev/null +++ b/doc/DESCRIPTION.md @@ -0,0 +1 @@ +Minetest is a free open-source voxel game engine with easy modding and game creation. diff --git a/doc/DESCRIPTION_fr.md b/doc/DESCRIPTION_fr.md new file mode 100644 index 0000000..0685205 --- /dev/null +++ b/doc/DESCRIPTION_fr.md @@ -0,0 +1,9 @@ +Some long and extensive description of what the app is and does, lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. + +### Features + +- Ut enim ad minim veniam, quis nostrud exercitation ullamco ; +- Laboris nisi ut aliquip ex ea commodo consequat ; +- Duis aute irure dolor in reprehenderit in voluptate ; +- Velit esse cillum dolore eu fugiat nulla pariatur ; +- Excepteur sint occaecat cupidatat non proident, sunt in culpa." diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md new file mode 100644 index 0000000..7bf3711 --- /dev/null +++ b/doc/DISCLAIMER.md @@ -0,0 +1,22 @@ +## Configuration + +How to configure this app: by SSH + +## Additional information + +* Migration from old package + +* You can’t migrate directly with an update. + * Before installing the new package you need to download this folder from your server `/var/games/minetest-server/.minetest/worlds/world` (this folder contains all world data) + * Uninstall the old package `sudo yunohost app remove minetest` + * Install the new one `sudo yunohost app install https://github.com/YunoHost-Apps/minetest_ynh` + * Stop Minetest service `sudo systemctl stop minetest` + * Copy the folder you have copied before in `/home/yunohost.app/minetest/.minetest/worlds` + * Start the Minetest service `sudo systemctl start minetest` + +* Installing mods + * For installing mods you need to create a `worldmods` folder in `/home/yunohost.app/minetest/.minetest/worlds/world/` + * Clone the repo of the mod in this folder (ex: `git clone https://github.com/minetest-mods/mesecons`) + * Edit `/home/yunohost.app/minetest/.minetest/worlds/world/world.mt` and add at the end `load_mod_mesecons = true` + * Restart Minetest with `sudo systemctl restart minetest` + * The mod is now installed :) diff --git a/doc/DISCLAIMER_fr.md b/doc/DISCLAIMER_fr.md new file mode 100644 index 0000000..aded581 --- /dev/null +++ b/doc/DISCLAIMER_fr.md @@ -0,0 +1,12 @@ +* Any known limitations, constrains or stuff not working, such as (but not limited to): + * requiring a full dedicated domain ? + * architectures not supported ? + * not-working single-sign on or LDAP integration ? + * the app requires an important amount of RAM / disk / .. to install or to work properly + * etc... + +* Other infos that people should be aware of, such as: + * any specific step to perform after installing (such as manually finishing the install, specific admin credentials, ...) + * how to configure / administrate the application if it ain't obvious + * upgrade process / specificities / things to be aware of ? + * security considerations ? diff --git a/doc/screenshots/.gitkeep b/doc/screenshots/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/doc/screenshots/1.jpg b/doc/screenshots/1.jpg new file mode 100644 index 0000000..e8e0d48 Binary files /dev/null and b/doc/screenshots/1.jpg differ diff --git a/manifest.json b/manifest.json index c3a0add..6014ecd 100644 --- a/manifest.json +++ b/manifest.json @@ -8,6 +8,11 @@ }, "version": "5.4.1~ynh2", "url": "http://www.minetest.net/", + "upstream": { + "license": "MIT", + "website": "http://www.minetest.net", + "code": "https://github.com/minetest/minetest" + }, "license": "MIT", "maintainer": { "name": "rafi59", @@ -17,10 +22,10 @@ "previous_maintainers": { "name": "Luc Didry", "email": "luc@framasoft.org", - "url": "https://framasoft.org" + "url": "https://framasoft.org" }, "requirements": { - "yunohost": ">= 4.1.7" + "yunohost": ">= 4.3.0" }, "multi_instance": true, "services": [ @@ -30,8 +35,7 @@ "install" : [ { "name": "domain", - "type": "domain", - "example": "domain.org" + "type": "domain" }, { "name": "is_public", diff --git a/scripts/backup b/scripts/backup index d65b5ee..70f44b7 100755 --- a/scripts/backup +++ b/scripts/backup @@ -15,7 +15,7 @@ source /usr/share/yunohost/helpers #================================================= ynh_clean_setup () { - ynh_clean_check_starting + true } # Exit if an error occurs during the execution of the script ynh_abort_if_errors diff --git a/scripts/remove b/scripts/remove index a4dfeb7..fcdb0d6 100755 --- a/scripts/remove +++ b/scripts/remove @@ -42,12 +42,12 @@ ynh_script_progression --message="Stopping and removing the systemd service..." ynh_remove_systemd_config #================================================= -# REMOVE DEPENDENCIES +# REMOVE LOGROTATE CONFIGURATION #================================================= -ynh_script_progression --message="Removing dependencies..." +ynh_script_progression --message="Removing logrotate configuration..." -# Remove metapackage and its dependencies -ynh_remove_app_dependencies +# Remove the app-specific logrotate config +ynh_remove_logrotate #================================================= # REMOVE APP MAIN DIR @@ -58,12 +58,12 @@ ynh_script_progression --message="Removing app main directory..." ynh_secure_remove --file="$final_path" #================================================= -# REMOVE LOGROTATE CONFIGURATION +# REMOVE DEPENDENCIES #================================================= -ynh_script_progression --message="Removing logrotate configuration..." +ynh_script_progression --message="Removing dependencies..." -# Remove the app-specific logrotate config -ynh_remove_logrotate +# Remove metapackage and its dependencies +ynh_remove_app_dependencies #================================================= # CLOSE A PORT @@ -71,7 +71,7 @@ ynh_remove_logrotate if yunohost firewall list | grep -q "\- $port$" then - ynh_script_progression --message="Closing port $port" + ynh_script_progression --message="Closing port $port..." ynh_exec_warn_less yunohost firewall disallow UDP $port fi diff --git a/scripts/restore b/scripts/restore index 195f489..23d5ba4 100755 --- a/scripts/restore +++ b/scripts/restore @@ -86,6 +86,13 @@ ynh_script_progression --message="Restoring the systemd configuration..." ynh_restore_file --origin_path="/etc/systemd/system/$app.service" systemctl enable $app.service --quiet +#================================================= +# RESTORE THE LOGROTATE CONFIGURATION +#================================================= +ynh_script_progression --message="Restoring the logrotate configuration..." + +ynh_restore_file --origin_path="/etc/logrotate.d/$app" + #================================================= # INTEGRATE SERVICE IN YUNOHOST #================================================= @@ -100,13 +107,6 @@ ynh_script_progression --message="Starting a systemd service..." ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/minetest.log" --line_match="listening on" -#================================================= -# RESTORE THE LOGROTATE CONFIGURATION -#================================================= -ynh_script_progression --message="Restoring the logrotate configuration..." - -ynh_restore_file --origin_path="/etc/logrotate.d/$app" - #================================================= # GENERIC FINALIZATION #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 315e1c5..2a908cd 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -25,7 +25,6 @@ pvp=$(ynh_app_setting_get --app=$app --key=pvp) creative=$(ynh_app_setting_get --app=$app --key=creative) damage=$(ynh_app_setting_get --app=$app --key=damage) servername=$(ynh_app_setting_get --app=$app --key=servername) -is_public=$(ynh_app_setting_get --app=$app --key=is_public) #================================================= # CHECK VERSION @@ -43,7 +42,6 @@ ynh_script_progression --message="Backing up the app before upgrading (may take ynh_backup_before_upgrade ynh_clean_setup () { ynh_clean_check_starting - # Restore it if the upgrade fails ynh_restore_upgradebackup } @@ -102,7 +100,6 @@ ynh_system_user_create --username=$app --home_dir=$home_path --use_shell #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= -ynh_script_progression --message="Upgrading source files..." if [ "$upgrade_type" == "UPGRADE_APP" ] then