Merge branch 'testing' into testing

README.md

@@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 Misskey is a decentralized microblogging platform. Since it exists within the Fediverse (a universe where various social media platforms are organized), it is mutually linked with other social media platforms.
 
 
-**Shipped version:** 12.96.1~ynh3
+**Shipped version:** 12.102.1~ynh1
 
 
 

README_fr.md

@@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
 
 Misskey est une plateforme de microblogging décentralisée. Puisqu'il existe au sein du Fediverse (un univers où diverses plateformes de médias sociaux sont organisées), il est mutuellement lié à d'autres plateformes de médias sociaux.
 
-**Version incluse :** 12.96.1~ynh3
+**Version incluse :** 12.102.1~ynh1
 
 
 

manifest.json

@@ -12,31 +12,33 @@
         "license": "AGPL-3.0",
         "website": "https://join.misskey.page",
         "code": "https://github.com/misskey-dev/misskey"
-  },
-  "license": "AGPL-3.0",
-  "maintainer": {
-    "name": "Anmol Sharma"
-  },
-  "requirements": {
-    "yunohost": ">= 4.3.0"
-  },
-  "multi_instance": true,
-  "services": ["nginx"],
-  "arguments": {
-    "install": [
-      {
-        "name": "domain",
-        "type": "domain"
-      },
-      {
-        "name": "is_public",
-        "type": "boolean",
-        "help": {
-            "en": "If enabled, Misskey will be accessible by people who do not have an account. This can be changed later via the webadmin.",
-            "fr": "Si cette case est cochée, Misskey sera accessible aux personnes n’ayant pas de compte. Vous pourrez changer ceci plus tard via la webadmin."
+    },
+    "license": "AGPL-3.0",
+    "maintainer": {
+        "name": "Anmol Sharma"
+    },
+    "requirements": {
+        "yunohost": ">= 4.3.0"
+    },
+    "multi_instance": true,
+    "services": [
+        "nginx"
+    ],
+    "arguments": {
+        "install": [
+            {
+                "name": "domain",
+                "type": "domain"
+            },
+            {
+                "name": "is_public",
+                "type": "boolean",
+                "help": {
+                    "en": "If enabled, Misskey will be accessible by people who do not have an account. This can be changed later via the webadmin.",
+                    "fr": "Si cette case est cochée, Misskey sera accessible aux personnes n’ayant pas de compte. Vous pourrez changer ceci plus tard via la webadmin."
                 },
-        "default": true
-      }
-    ]
-  }
+                "default": true
+            }
+        ]
+    }
 }

scripts/install

@@ -118,7 +118,7 @@ ynh_add_nginx_config
 #=================================================
 ynh_script_progression --message="Configuring a systemd service..." --weight=1
 
-ynh_replace_string --match_string="__ENV_PATH__" --replace_string="$PATH" --target_file="../conf/systemd.service"
+env_path="$PATH"
 
 # Create a dedicated systemd config
 ynh_add_systemd_config

scripts/upgrade

@@ -135,7 +135,7 @@ popd
 #=================================================
 ynh_script_progression --message="Upgrading systemd configuration..." --weight=1
 
-ynh_replace_string --match_string="__ENV_PATH__" --replace_string="$PATH" --target_file="../conf/systemd.service"
+env_path="$PATH"
 
 # Create a dedicated systemd config
 ynh_add_systemd_config