chore(release): 1.6.1 [skip ci]

## [1.6.1](https://github.com/revanced/revanced-cli/compare/v1.6.0...v1.6.1) (2022-06-21)

### Bug Fixes

* remove `-e` from `experimental` option ([3829136](3829136c49))

CHANGELOG.md

@@ -1,3 +1,25 @@
+## [1.6.1](https://github.com/revanced/revanced-cli/compare/v1.6.0...v1.6.1) (2022-06-21)
+
+
+### Bug Fixes
+
+* remove `-e` from `experimental` option ([3829136](https://github.com/revanced/revanced-cli/commit/3829136c49ddce1dc6b01eda04ce013540b213c2))
+
+# [1.6.0](https://github.com/revanced/revanced-cli/compare/v1.5.1...v1.6.0) (2022-06-21)
+
+
+### Features
+
+* rename `debugging` option to `experimental` ([98bd6f3](https://github.com/revanced/revanced-cli/commit/98bd6f3f4b3eb34c445cbd5e3a3196f399f8bb3b))
+* use `install` mode by default ([1a3db77](https://github.com/revanced/revanced-cli/commit/1a3db77c21b5795220fbac1ec36827fc521fface))
+
+## [1.5.1](https://github.com/revanced/revanced-cli/compare/v1.5.0...v1.5.1) (2022-06-21)
+
+
+### Bug Fixes
+
+* update patcher version ([09b9027](https://github.com/revanced/revanced-cli/commit/09b9027e5e28f0483e74b711cf65a7876267a339)), closes [#45](https://github.com/revanced/revanced-cli/issues/45)
+
 # [1.5.0](https://github.com/revanced/revanced-cli/compare/v1.4.5...v1.5.0) (2022-06-20)
 
 

build.gradle.kts

@@ -31,7 +31,7 @@ repositories {
 dependencies {
     implementation(kotlin("stdlib"))
     implementation(kotlin("reflect"))
-    implementation("app.revanced:revanced-patcher:1.3.0")
+    implementation("app.revanced:revanced-patcher:1.3.1")
     implementation("info.picocli:picocli:4.6.3")
     implementation("com.android.tools.build:apksig:7.2.1")
     implementation("com.github.revanced:jadb:master-SNAPSHOT") // updated fork

gradle.properties

@@ -1,2 +1,2 @@
 kotlin.code.style = official
-version = 1.5.0
+version = 1.6.1

src/main/kotlin/app/revanced/cli/command/MainCommand.kt

@@ -6,9 +6,7 @@ import app.revanced.patcher.PatcherOptions
 import app.revanced.patcher.extensions.PatchExtensions.patchName
 import app.revanced.patcher.util.patch.implementation.JarPatchBundle
 import app.revanced.utils.adb.Adb
-import picocli.CommandLine.Command
+import picocli.CommandLine.*
-import picocli.CommandLine.Option
-import picocli.CommandLine.ArgGroup
 import java.io.File
 import java.nio.file.Files
 
@@ -17,98 +15,96 @@ import java.nio.file.Files
 )
 internal object MainCommand : Runnable {
 
-	@ArgGroup(exclusive = false, multiplicity="1")
+    @ArgGroup(exclusive = false, multiplicity = "1")
-	lateinit var args: Args
+    lateinit var args: Args
 
-	class Args
+    class Args {
-	{
+        @Option(names = ["-b", "--bundles"], description = ["One or more bundles of patches"], required = true)
-		@Option(names = ["-b", "--bundles"], description = ["One or more bundles of patches"], required = true)
+        var patchBundles = arrayOf<String>()
-    	var patchBundles = arrayOf<String>()
-		
-		@ArgGroup(exclusive = false)
-		lateinit var lArgs: ListingArgs
 
-		@ArgGroup(exclusive = false)
+        @ArgGroup(exclusive = false)
-		lateinit var pArgs: PatchingArgs
+        var lArgs: ListingArgs? = null
-	}
 
-	class ListingArgs {
+        @ArgGroup(exclusive = false)
-    	@Option(names = ["-l", "--list"], description = ["List patches only"], required = true)
+        var pArgs: PatchingArgs? = null
-    	public var listOnly: Boolean = false
+    }
-	}
 
-	class PatchingArgs {
+    class ListingArgs {
-    	@Option(names = ["-a", "--apk"], description = ["Input file to be patched"], required = true)
+        @Option(names = ["-l", "--list"], description = ["List patches only"], required = true)
-    	lateinit var inputFile: File
+        var listOnly: Boolean = false
+    }
 
-    	@Option(names = ["-o", "--out"], description = ["Output file path"], required = true)
+    class PatchingArgs {
-    	lateinit var outputPath: String
+        @Option(names = ["-a", "--apk"], description = ["Input file to be patched"], required = true)
+        lateinit var inputFile: File
 
-    	@Option(
+        @Option(names = ["-o", "--out"], description = ["Output file path"], required = true)
-    	    names = ["-i", "--include"],
+        lateinit var outputPath: String
-    	    description = ["Which patches to include. If none is specified, all compatible default patches will be included"]
-    	)
-    	var includedPatches = arrayOf<String>()
 
-    	@Option(names = ["-r", "--resource-patcher"], description = ["Disable patching resources"])
+        @Option(names = ["-e", "--exclude"], description = ["Explicitly exclude patches"])
-    	var disableResourcePatching: Boolean = false
+        var excludedPatches = arrayOf<String>()
 
-    	@Option(names = ["--debugging"], description = ["Disable patch version compatibility"])
+        @Option(names = ["-r", "--resource-patcher"], description = ["Disable patching resources"])
-    	var debugging: Boolean = false
+        var disableResourcePatching: Boolean = false
 
-    	@Option(names = ["-m", "--merge"], description = ["One or more dex file containers to merge"])
+        @Option(names = ["--experimental"], description = ["Disable patch version compatibility patch"])
-    	var mergeFiles = listOf<File>()
+        var experimental: Boolean = false
 
-    	@Option(names = ["--install"], description = ["If specified, instead of mounting, install"])
+        @Option(names = ["-m", "--merge"], description = ["One or more dex file containers to merge"])
-    	var install: Boolean = false
+        var mergeFiles = listOf<File>()
 
-    	@Option(names = ["--cn"], description = ["Overwrite the default CN for the signed file"])
+        @Option(names = ["--mount"], description = ["If specified, instead of installing, mount"])
-    	var cn = "ReVanced"
+        var mount: Boolean = false
 
-    	@Option(names = ["-p", "--password"], description = ["Overwrite the default password for the signed file"])
+        @Option(names = ["--cn"], description = ["Overwrite the default CN for the signed file"])
-    	var password = "ReVanced"
+        var cn = "ReVanced"
 
-    	@Option(names = ["-d", "--deploy-on"], description = ["If specified, deploy to adb device with given name"])
+        @Option(names = ["-p", "--password"], description = ["Overwrite the default password for the signed file"])
-    	var deploy: String? = null
+        var password = "ReVanced"
 
-    	@Option(names = ["-t", "--temp-dir"], description = ["Temporal resource cache directory"])
+        @Option(names = ["-d", "--deploy-on"], description = ["If specified, deploy to adb device with given name"])
-    	var cacheDirectory = "revanced-cache"
+        var deploy: String? = null
 
-    	@Option(
+        @Option(names = ["-t", "--temp-dir"], description = ["Temporal resource cache directory"])
-    	    names = ["-c", "--clean"],
+        var cacheDirectory = "revanced-cache"
-    	    description = ["Clean the temporal resource cache directory. This will be done anyways when running the patcher"]
-    	)
-    	var clean: Boolean = false
-	}
-    
-	override fun run() {
-		try
-		{
-        	if (args.lArgs.listOnly) {
-        	    for (patchBundlePath in args.patchBundles) for (patch in JarPatchBundle(patchBundlePath).loadPatches()) {
-        	        println("[available] ${patch.patchName}")
-        	    }
-        	    return
-        	}
-		} catch (e: UninitializedPropertyAccessException) {}
 
-		val args = args.pArgs;
+        @Option(
+            names = ["-c", "--clean"],
+            description = ["Clean the temporal resource cache directory. This will be done anyways when running the patcher"]
+        )
+        var clean: Boolean = false
+    }
 
-        val patcher = app.revanced.patcher.Patcher(PatcherOptions(args.inputFile, args.cacheDirectory, !args.disableResourcePatching))
+    override fun run() {
+        if (args.lArgs?.listOnly == true) {
+            for (patchBundlePath in args.patchBundles) for (patch in JarPatchBundle(patchBundlePath).loadPatches()) {
+                println("[available] ${patch.patchName}")
+            }
+            return
+        }
+
+        val args = args.pArgs ?: return
+
+        val patcher = app.revanced.patcher.Patcher(
+            PatcherOptions(
+                args.inputFile, args.cacheDirectory, !args.disableResourcePatching
+            )
+        )
 
         val outputFile = File(args.outputPath)
 
         val adb: Adb? = args.deploy?.let {
-            Adb(outputFile, patcher.data.packageMetadata.packageName, args.deploy!!, args.install)
+            Adb(outputFile, patcher.data.packageMetadata.packageName, args.deploy!!, !args.mount)
         }
 
-        val patchedFile = if (args.install) File(args.cacheDirectory).resolve("${outputFile.nameWithoutExtension}_raw.apk") else outputFile
+        val patchedFile =
+            if (args.mount) outputFile else File(args.cacheDirectory).resolve("${outputFile.nameWithoutExtension}_raw.apk")
 
         Patcher.start(patcher, patchedFile)
 
         println("[aligning & signing]")
 
-        if (args.install) {
+        if (args.mount) {
             Signing.start(
                 patchedFile,
                 outputFile,

src/main/kotlin/app/revanced/cli/patcher/Patcher.kt

@@ -10,12 +10,12 @@ import java.nio.file.Files
 
 internal object Patcher {
     internal fun start(patcher: app.revanced.patcher.Patcher, output: File) {
-		val args = args.pArgs;
+		val args = args.pArgs!!
 
         // merge files like necessary integrations
         patcher.mergeFiles()
         // add patches, but filter incompatible or excluded patches
-        patcher.addPatchesFiltered(includeFilter = args.includedPatches.isNotEmpty())
+        patcher.addPatchesFiltered(excludePatches = args.excludedPatches.isNotEmpty())
         // apply patches
         patcher.applyPatchesVerbose()
 

src/main/kotlin/app/revanced/cli/signing/Signing.kt

@@ -7,7 +7,7 @@ import java.io.File
 
 object Signing {
     fun start(inputFile: File, outputFile: File, cn: String, password: String) {
-        val cacheDirectory = File(args.pArgs.cacheDirectory)
+        val cacheDirectory = File(args.pArgs!!.cacheDirectory)
         val alignedOutput = cacheDirectory.resolve("${outputFile.nameWithoutExtension}_aligned.apk")
         val signedOutput = cacheDirectory.resolve("${outputFile.nameWithoutExtension}_signed.apk")
 

src/main/kotlin/app/revanced/utils/patcher/Patcher.kt

@@ -11,12 +11,12 @@ import app.revanced.patcher.patch.base.Patch
 import app.revanced.patcher.util.patch.implementation.JarPatchBundle
 
 fun Patcher.addPatchesFiltered(
-    includeFilter: Boolean = false
+    excludePatches: Boolean = false
 ) {
     val packageName = this.data.packageMetadata.packageName
     val packageVersion = this.data.packageMetadata.packageVersion
 
-    MainCommand.args.patchBundles.forEach { bundle ->
+    args.patchBundles.forEach { bundle ->
         val includedPatches = mutableListOf<Class<out Patch<Data>>>()
         JarPatchBundle(bundle).loadPatches().forEach patch@{ patch ->
             val compatiblePackages = patch.compatiblePackages
@@ -24,13 +24,11 @@ fun Patcher.addPatchesFiltered(
 
             val prefix = "[skipped] $patchName"
 
-			val args = MainCommand.args.pArgs
+            val args = MainCommand.args.pArgs!!
 
-            if (includeFilter) {
+            if (excludePatches && args.excludedPatches.contains(patchName)) {
-                if (!args.includedPatches.contains(patchName)) {
+                println("$prefix: Explicitly excluded.")
-                    println("$prefix: Explicitly excluded.")
+                return@patch
-                    return@patch
-                }
             } else if (!patch.include) {
                 println("$prefix: Implicitly excluded.")
                 return@patch
@@ -43,7 +41,7 @@ fun Patcher.addPatchesFiltered(
                     return@patch
                 }
 
-                if (!(args.debugging || compatiblePackages.any { it.versions.isEmpty() || it.versions.any { version -> version == packageVersion }})) {
+                if (!(args.experimental || compatiblePackages.any { it.versions.isEmpty() || it.versions.any { version -> version == packageVersion } })) {
                     println("$prefix: The package version is $packageVersion and is incompatible.")
                     return@patch
                 }
@@ -68,5 +66,5 @@ fun Patcher.applyPatchesVerbose() {
 }
 
 fun Patcher.mergeFiles() {
-    this.addFiles(MainCommand.args.pArgs.mergeFiles)
+    this.addFiles(args.pArgs!!.mergeFiles)
 }