Browse Source

Merge upstream mireu (#499)

enfein 3 years ago
parent
commit
45f2013517

+ 1 - 1
.gitmodules

@@ -33,7 +33,7 @@
 	url = https://github.com/SagerNet/termux-view
 [submodule "plugin/mieru/src/main/go/mieru"]
 	path = plugin/mieru/src/main/go/mieru
-	url = https://github.com/SagerNet/mieru
+	url = https://github.com/enfein/mieru
 [submodule "plugin/tuic/src/main/rust/tuic"]
 	path = plugin/tuic/src/main/rust/tuic
 	url = https://github.com/EAimTY/tuic

+ 3 - 3
app/src/main/java/io/nekohasekai/sagernet/bg/proto/V2RayInstance.kt

@@ -378,10 +378,10 @@ abstract class V2RayInstance(
                         configFile.writeText(config)
                         cacheFiles.add(configFile)
 
-                        env["MIERU_CONFIG_FILE"] = configFile.absolutePath
+                        env["MIERU_CONFIG_JSON_FILE"] = configFile.absolutePath
 
                         val commands = mutableListOf(
-                            initPlugin("mieru-plugin").path, "run_plugin"
+                            initPlugin("mieru-plugin").path, "run"
                         )
 
                         processes.start(commands, env)
@@ -479,4 +479,4 @@ abstract class V2RayInstance(
         isClosed = true
     }
 
-}
+}

+ 1 - 1
plugin/mieru/src/main/go/mieru

@@ -1 +1 @@
-Subproject commit 35885d28d5b5fb2d1730726d0b0a55d18ce00656
+Subproject commit 98ba48d5b8d720bc492d9b57889bea1c4c4fc138