Upgrade to version 5.4.1

README.md

@@ -11,7 +11,7 @@ If you don’t have YunoHost, please see [here](https://yunohost.org/#/install)
 ## Overview
 Minetest is a free open-source voxel game engine with easy modding and game creation.
 
-**Shipped version:** 5.4.0
+**Shipped version:** 5.4.1
 
 ## Screenshots
 

README_fr.md

@@ -11,7 +11,7 @@ Si vous n’avez pas YunoHost, veuillez consulter [ici](https://yunohost.org/#/i
 ## Aperçu
 Minetest est un moteur de jeu voxel open-source avec modding et création de jeux faciles.
 
-**Version incluse:** 5.4.0
+**Version incluse:** 5.4.1
 
 ## Captures d’écran
 

conf/app.src

@@ -1,6 +1,6 @@
-SOURCE_URL=https://github.com/minetest/minetest/archive/5.4.0.tar.gz
+SOURCE_URL=https://github.com/minetest/minetest/archive/5.4.1.tar.gz
-SOURCE_SUM=6e9b299e156651be9bcf973a9232cff32215de31dfae5ea770a71d1757cab014
+SOURCE_SUM=de9e4410583c845c104b4be25f9d0b8743d8573c120149b8910ae2519f9ab14e
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
-SOURCE_FILENAME=minetest-5.4.0.tar.gz
+SOURCE_FILENAME=minetest-5.4.1.tar.gz

conf/minetest_game.src

@@ -1,6 +1,6 @@
-SOURCE_URL=https://github.com/minetest/minetest_game/archive/5.4.0.tar.gz
+SOURCE_URL=https://github.com/minetest/minetest_game/archive/5.4.1.tar.gz
-SOURCE_SUM=520d2056085ec11e8806cf5a8f928537797d27a86704770bf408c113ea9881cb
+SOURCE_SUM=b4bfa0755b88230cf4bdb6af6a0951dd1248f6cdf87fecc340e43ac12c80b0b2
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
-SOURCE_FILENAME=minetest_game-5.4.0.tar.gz
+SOURCE_FILENAME=minetest_game-5.4.1.tar.gz

manifest.json

@@ -6,7 +6,7 @@
         "en": "Free, open source voxel game engine and game. Need a client to connect to the server.",
         "fr": "Moteur de jeu de type « bac à sable » gratuit et open source. Nécessite un client pour se connecter au serveur."
     },
-    "version": "5.4.0~ynh1",
+    "version": "5.4.1~ynh1",
     "url": "http://www.minetest.net/",
     "license": "MIT",
     "maintainer": {
@@ -20,7 +20,7 @@
 	"url": "https://framasoft.org"
 },
     "requirements": {
-        "yunohost": ">= 3.8.1"
+        "yunohost": ">= 4.1.7"
     },
     "multi_instance": true,
     "services": [
@@ -31,19 +31,11 @@
             {
                 "name": "domain",
                 "type": "domain",
-                "ask": {
-                    "en": "Choose a domain for your Minetest server",
-                    "fr": "Choisissez un domaine pour votre serveur Minetest"
-                },
                 "example": "domain.org"
             },
             {
                 "name": "is_public",
                 "type": "boolean",
-                "ask": {
-                    "en": "Is it a public server? (should we announce it?)",
-                    "fr": "Est-ce un serveur public ? (devons-nous l'annoncer ?)"
-                },
                 "default": false
             },
             {

scripts/upgrade

@@ -19,13 +19,13 @@ app=$YNH_APP_INSTANCE_NAME
 domain=$(ynh_app_setting_get --app=$app --key=domain)
 port=$(ynh_app_setting_get --app=$app --key=port)
 game=$(ynh_app_setting_get --app=$app --key=game)
-is_public=$(ynh_app_setting_get --app=$app --key=is_public)
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 home_path=$(ynh_app_setting_get --app=$app --key=home_path)
 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)
 
 #=================================================
 # ENSURE DOWNWARD COMPATIBILITY
@@ -38,10 +38,8 @@ if [ "$version" = "0.01" ]; then
 ynh_die --message="You can't upgrade to this version with simple upgrade. Please read the readme for upgrading https://github.com/YunoHost-Apps/minetest_ynh#additional-information ..."
 fi
 
-
 ynh_script_progression --message="Ensuring downward compatibility..."
 
-
 # If final_path doesn't exist, create it
 if [ -z $final_path ]; then
 	final_path=/opt/yunohost/$app
@@ -78,8 +76,18 @@ ynh_abort_if_errors
 #=================================================
 ynh_script_progression --message="Upgrading source files..."
 
-# Remove old install
+if [ "$upgrade_type" == "UPGRADE_APP" ]
-ynh_secure_remove --file="$final_path"
+then
+	ynh_script_progression --message="Upgrading source files..." --time --weight=1
+
+	# Remove old install
+	ynh_secure_remove --file="$final_path"
+
+	# Download, check integrity, uncompress and patch the source from app.src
+	ynh_setup_source --dest_dir="$final_path"
+fi
+
+
 
 # Download, check integrity, uncompress and patch the source from app.src
 ynh_setup_source --dest_dir="$final_path"