Skip to content

Commit d0fc886

Browse files
committed
fix: remove duplicate options entries.
1 parent 1ccbed8 commit d0fc886

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

src/main/kotlin/app/revanced/utils/Options.kt

+6-2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import app.revanced.cli.logging.CliLogger
55
import app.revanced.patcher.extensions.PatchExtensions.options
66
import app.revanced.patcher.extensions.PatchExtensions.patchName
77
import app.revanced.patcher.patch.NoSuchOptionException
8+
import app.revanced.utils.Options.PatchOption.Option
89
import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
910
import java.io.File
1011

@@ -25,9 +26,12 @@ internal object Options {
2526
.map { patch ->
2627
PatchOption(
2728
patch.patchName,
28-
patch.options!!.map { option -> PatchOption.Option(option.key, option.value) }
29+
patch.options!!.map { option -> Option(option.key, option.value) }
2930
)
30-
}.let {
31+
}
32+
// See https://github.com/revanced/revanced-patches/pull/2434/commits/60e550550b7641705e81aa72acfc4faaebb225e7.
33+
.distinctBy { it.patchName }
34+
.let {
3135
if (prettyPrint)
3236
mapper.writerWithDefaultPrettyPrinter().writeValueAsString(it)
3337
else

0 commit comments

Comments
 (0)