fix nio2 windows problem - funorpain

This commit is contained in:
Connor Tumbleson 2013-12-08 16:48:59 -06:00
parent 0949a6c50f
commit 259ff5ef01

View File

@ -585,7 +585,7 @@ public class Androlib {
// in order to get the path relative to the zip, we strip off the absolute path, minus what we // in order to get the path relative to the zip, we strip off the absolute path, minus what we
// already have in the zip. thus /var/files/apktool/apk/unknown/folder/file => /folder/file // already have in the zip. thus /var/files/apktool/apk/unknown/folder/file => /folder/file
Path dest = fs.getPath(root.toString() + insert.getAbsolutePath().replace(location.toString(),"")); Path dest = fs.getPath(root.toString(), insert.getAbsolutePath().replace(location.toString(),""));
Path newFile = Paths.get(insert.getAbsolutePath()); Path newFile = Paths.get(insert.getAbsolutePath());
Files.copy(newFile,dest, StandardCopyOption.REPLACE_EXISTING); Files.copy(newFile,dest, StandardCopyOption.REPLACE_EXISTING);
fs.close(); fs.close();
@ -598,7 +598,7 @@ public class Androlib {
try(FileSystem fs = FileSystems.newFileSystem(apkFileSystem, zip_properties)) { try(FileSystem fs = FileSystems.newFileSystem(apkFileSystem, zip_properties)) {
Path root = fs.getPath("/"); Path root = fs.getPath("/");
Path dest = fs.getPath(root.toString() + insert.getAbsolutePath().replace(location.toString(),"")); Path dest = fs.getPath(root.toString(), insert.getAbsolutePath().replace(location.toString(),""));
Path parent = dest.normalize(); Path parent = dest.normalize();
// check for folder existing in apkFileSystem // check for folder existing in apkFileSystem