mirror of
https://github.com/revanced/Apktool.git
synced 2024-09-05 05:55:29 +02:00
add warning for unknown operating system and fix getFrameworkDir to use non hardcode seperator char
This commit is contained in:
parent
792188b9fe
commit
bd9dce78b4
@ -781,8 +781,7 @@ final public class AndrolibResources {
|
|||||||
if (sFrameworkFolder != null) {
|
if (sFrameworkFolder != null) {
|
||||||
path = sFrameworkFolder;
|
path = sFrameworkFolder;
|
||||||
} else if (OSDetection.isMacOSX()) {
|
} else if (OSDetection.isMacOSX()) {
|
||||||
// store in user-home, for Mac OS X
|
path = System.getProperty("user.home") + File.separatorChar + "Library" + File.separatorChar + "apktool" + File.separatorChar + "framework";
|
||||||
path = System.getProperty("user.home") + File.separatorChar + "Library/apktool/framework";
|
|
||||||
} else {
|
} else {
|
||||||
path = System.getProperty("user.home") + File.separatorChar + "apktool" + File.separatorChar + "framework";
|
path = System.getProperty("user.home") + File.separatorChar + "apktool" + File.separatorChar + "framework";
|
||||||
}
|
}
|
||||||
@ -807,7 +806,6 @@ final public class AndrolibResources {
|
|||||||
* Aapt can still be overridden via --aapt/-a on build, but specific features will be disabled
|
* Aapt can still be overridden via --aapt/-a on build, but specific features will be disabled
|
||||||
*
|
*
|
||||||
* @url https://github.com/iBotPeaches/platform_frameworks_base
|
* @url https://github.com/iBotPeaches/platform_frameworks_base
|
||||||
* @return
|
|
||||||
* @throws AndrolibException
|
* @throws AndrolibException
|
||||||
*/
|
*/
|
||||||
public File getAaptBinaryFile() throws AndrolibException {
|
public File getAaptBinaryFile() throws AndrolibException {
|
||||||
@ -822,6 +820,7 @@ final public class AndrolibResources {
|
|||||||
mAaptBinary = Jar
|
mAaptBinary = Jar
|
||||||
.getResourceAsFile("/prebuilt/aapt/windows/aapt.exe");
|
.getResourceAsFile("/prebuilt/aapt/windows/aapt.exe");
|
||||||
} else {
|
} else {
|
||||||
|
LOGGER.warning("Unknown Operating System: " + OSDetection.returnOS());
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
} catch (BrutException ex) {
|
} catch (BrutException ex) {
|
||||||
|
Loading…
Reference in New Issue
Block a user