diff --git a/src/main/kotlin/app/revanced/cli/command/MainCommand.kt b/src/main/kotlin/app/revanced/cli/command/MainCommand.kt index aff17a0f..c751933a 100644 --- a/src/main/kotlin/app/revanced/cli/command/MainCommand.kt +++ b/src/main/kotlin/app/revanced/cli/command/MainCommand.kt @@ -87,7 +87,7 @@ internal object MainCommand : Runnable { names = ["--exclusive"], description = ["Only installs the patches you include, not including any patch by default"] ) - var defaultExclude = false + var exclusive = false @Option(names = ["-i", "--include"], description = ["Include patches"]) var includedPatches = arrayOf() diff --git a/src/main/kotlin/app/revanced/utils/patcher/Patcher.kt b/src/main/kotlin/app/revanced/utils/patcher/Patcher.kt index f9912abe..c6e86cea 100644 --- a/src/main/kotlin/app/revanced/utils/patcher/Patcher.kt +++ b/src/main/kotlin/app/revanced/utils/patcher/Patcher.kt @@ -18,18 +18,9 @@ fun Patcher.addPatchesFiltered(allPatches: List>>) { allPatches.forEach patchLoop@{ patch -> val compatiblePackages = patch.compatiblePackages val patchName = patch.patchName - - val prefix = "Skipping $patchName" - val args = MainCommand.args.patchArgs?.patchingArgs!! - if (args.excludedPatches.contains(patchName)) { - logger.info("$prefix: Manually excluded") - return@patchLoop - } else if ((!patch.include || args.defaultExclude) && !args.includedPatches.contains(patchName)) { - logger.info("$prefix: Excluded by default") - return@patchLoop - } + val prefix = "Skipping $patchName" if (compatiblePackages == null) logger.trace("$patchName: No constraint on packages.") else { @@ -51,6 +42,14 @@ fun Patcher.addPatchesFiltered(allPatches: List>>) { } } + if (args.excludedPatches.contains(patchName)) { + logger.info("$prefix: Manually excluded") + return@patchLoop + } else if ((!patch.include || args.exclusive) && !args.includedPatches.contains(patchName)) { + logger.info("$prefix: Excluded by default") + return@patchLoop + } + logger.trace("Adding $patchName") includedPatches.add(patch) }