ReVanced-Mirror/Apktool
1
0
Fork 0
mirror of https://github.com/revanced/Apktool.git synced 2024-12-12 13:57:46 +01:00
Code Issues Projects Releases Wiki Activity

fix: normalize path to fix building .apk on Windows

Browse Source 
- fixes #1741
This commit is contained in:
Connor Tumbleson 2018-04-05 16:24:58 -04:00
parent e679d71615
commit 07afbdb52b
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
brut.j.dir/src/main/java/brut/directory/ZipUtils.java
View File

@ -54,7 +54,8 @@ public class ZipUtils {
throws BrutException, IOException { throws BrutException, IOException {
for (final File file : folder.listFiles()) { for (final File file : folder.listFiles()) {
if (file.isFile()) { if (file.isFile()) {
final ZipEntry zipEntry = new ZipEntry(BrutIO.sanitizeUnknownFile(folder, file.getPath().substring(prefixLength))); final String normalizedPath = BrutIO.normalizePath(file.getPath().substring(prefixLength));
final ZipEntry zipEntry = new ZipEntry(BrutIO.sanitizeUnknownFile(folder, normalizedPath));
// aapt binary by default takes in parameters via -0 arsc to list extensions that shouldn't be // aapt binary by default takes in parameters via -0 arsc to list extensions that shouldn't be
// compressed. We will replicate that behavior // compressed. We will replicate that behavior

10
brut.j.util/src/main/java/brut/util/BrutIO.java
View File

@ -97,6 +97,16 @@ public class BrutIO {
return canonicalEntryPath.substring(canonicalDirPath.length()); return canonicalEntryPath.substring(canonicalDirPath.length());
} }
public static String normalizePath(String path) {
char separator = File.separatorChar;
if (separator != '/') {
return path.replace(separator, '/');
}
return path;
}
public static void copy(File inputFile, ZipOutputStream outputFile) throws IOException { public static void copy(File inputFile, ZipOutputStream outputFile) throws IOException {
try ( try (
FileInputStream fis = new FileInputStream(inputFile) FileInputStream fis = new FileInputStream(inputFile)