mirror of
https://github.com/ReVanced/revanced-cli.git
synced 2026-01-19 17:33:57 +00:00
feat: use separate command to uninstall
This commit is contained in:
@@ -37,10 +37,10 @@ private class CLIVersionProvider : IVersionProvider {
|
||||
description = ["Command line application to use ReVanced"],
|
||||
mixinStandardHelpOptions = true,
|
||||
versionProvider = CLIVersionProvider::class,
|
||||
subcommands = [ListPatchesCommand::class]
|
||||
subcommands = [ListPatchesCommand::class, UninstallCommand::class]
|
||||
)
|
||||
internal object MainCommand : Runnable {
|
||||
val logger = DefaultCliLogger()
|
||||
internal val logger = DefaultCliLogger()
|
||||
|
||||
// @ArgGroup(exclusive = false, multiplicity = "1")
|
||||
lateinit var args: Args
|
||||
@@ -145,11 +145,12 @@ internal object MainCommand : Runnable {
|
||||
}
|
||||
}
|
||||
|
||||
fun main(args: Array<String>) {
|
||||
CommandLine(MainCommand).execute(*args)
|
||||
}
|
||||
|
||||
override fun run() {
|
||||
val patchArgs = args.patchArgs
|
||||
|
||||
if (args.packageName != null) return uninstall()
|
||||
|
||||
val patchingArgs = patchArgs?.patchingArgs ?: return
|
||||
|
||||
if (!patchingArgs.inputFile.exists()) return logger.error("Input file ${patchingArgs.inputFile} does not exist.")
|
||||
@@ -241,18 +242,6 @@ internal object MainCommand : Runnable {
|
||||
logger.info(result)
|
||||
}
|
||||
|
||||
/**
|
||||
* Uninstall the specified package from the specified device.
|
||||
*
|
||||
*/
|
||||
private fun uninstall() = args.deviceSerial?.let { serial ->
|
||||
if (args.mount) {
|
||||
AdbManager.RootAdbManager(serial, logger)
|
||||
} else {
|
||||
AdbManager.UserAdbManager(serial, logger)
|
||||
}.uninstall(args.packageName!!)
|
||||
} ?: logger.error("No device serial specified")
|
||||
|
||||
private fun Patcher.filterPatchSelection(patches: PatchList) = buildList {
|
||||
val packageName = context.packageMetadata.packageName
|
||||
val packageVersion = context.packageMetadata.packageVersion
|
||||
@@ -326,8 +315,4 @@ internal object MainCommand : Runnable {
|
||||
add(patch)
|
||||
}
|
||||
}
|
||||
|
||||
fun main(args: Array<String>) {
|
||||
CommandLine(MainCommand).execute(*args)
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user