From cf1d512f4b379c08e73a47750cddffbfd60473b0 Mon Sep 17 00:00:00 2001 From: oSumAtrIX Date: Sat, 11 Jun 2022 20:02:03 +0200 Subject: [PATCH] refactor: write cache files with proper names --- src/main/kotlin/app/revanced/cli/command/MainCommand.kt | 2 +- src/main/kotlin/app/revanced/cli/signing/Signing.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/kotlin/app/revanced/cli/command/MainCommand.kt b/src/main/kotlin/app/revanced/cli/command/MainCommand.kt index f63e06a..6dd98d1 100644 --- a/src/main/kotlin/app/revanced/cli/command/MainCommand.kt +++ b/src/main/kotlin/app/revanced/cli/command/MainCommand.kt @@ -79,7 +79,7 @@ internal object MainCommand : Runnable { Adb(outputFile, patcher.data.packageMetadata.packageName, deploy!!, install) } - val patchedFile = if (install) File(cacheDirectory).resolve("raw.apk") else outputFile + val patchedFile = if (install) File(cacheDirectory).resolve("${outputFile.nameWithoutExtension}_raw.apk") else outputFile Patcher.start(patcher, patchedFile) diff --git a/src/main/kotlin/app/revanced/cli/signing/Signing.kt b/src/main/kotlin/app/revanced/cli/signing/Signing.kt index f6c9e24..102ca89 100644 --- a/src/main/kotlin/app/revanced/cli/signing/Signing.kt +++ b/src/main/kotlin/app/revanced/cli/signing/Signing.kt @@ -8,8 +8,8 @@ import java.io.File object Signing { fun start(inputFile: File, outputFile: File, cn: String, password: String) { val cacheDirectory = File(cacheDirectory) - val alignedOutput = cacheDirectory.resolve("aligned.apk") - val signedOutput = cacheDirectory.resolve("signed.apk") + val alignedOutput = cacheDirectory.resolve("${outputFile.nameWithoutExtension}_aligned.apk") + val signedOutput = cacheDirectory.resolve("${outputFile.nameWithoutExtension}_signed.apk") // align the inputFile and write to alignedOutput ZipAligner.align(inputFile, alignedOutput)