diff --git a/CHANGES b/CHANGES index f2760a0b..704d0ae5 100644 --- a/CHANGES +++ b/CHANGES @@ -21,6 +21,7 @@ v2.0.0 (TBA) -Fixed (issue #326) - Fixed PNG increasing brightness on build (Thanks Christiaan) -Fixed (issue #448) - Merge smali2 into Apktool -Fixed (issue #496) - Fixes Windows builds caused by java.nio problems +-Fixed (issue #510) - Any error output is sent stderr instead of stdout -Updated known bytes for configurations to 38 (from addition of layout direction) -Fixed NPE when handling odex apks even with --no-src specified. (Thanks Rodrigo Chiossi) diff --git a/brut.apktool/apktool-cli/src/main/java/brut/apktool/Main.java b/brut.apktool/apktool-cli/src/main/java/brut/apktool/Main.java index f3e6ebfc..727c8521 100644 --- a/brut.apktool/apktool-cli/src/main/java/brut/apktool/Main.java +++ b/brut.apktool/apktool-cli/src/main/java/brut/apktool/Main.java @@ -60,7 +60,7 @@ public class Main { try { commandLine = parser.parse(allOptions, args, false); } catch (ParseException ex) { - System.out.println(ex.getMessage()); + System.err.println(ex.getMessage()); usage(commandLine); return; } @@ -165,24 +165,24 @@ public class Main { try { decoder.decode(); } catch (OutDirExistsException ex) { - System.out + System.err .println("Destination directory (" + outDir.getAbsolutePath() + ") " + "already exists. Use -f switch if you want to overwrite it."); System.exit(1); } catch (InFileNotFoundException ex) { - System.out.println("Input file (" + apkName + ") " + "was not found or was not readable."); + System.err.println("Input file (" + apkName + ") " + "was not found or was not readable."); System.exit(1); } catch (CantFindFrameworkResException ex) { - System.out + System.err .println("Can't find framework resources for package of id: " + String.valueOf(ex.getPkgId()) + ". You must install proper " + "framework files, see project website for more info."); System.exit(1); } catch (IOException ex) { - System.out.println("Could not modify file. Please ensure you have permission."); + System.err.println("Could not modify file. Please ensure you have permission."); System.exit(1); } diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/AndrolibResources.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/AndrolibResources.java index 26d10497..97a034e2 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/AndrolibResources.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/AndrolibResources.java @@ -791,7 +791,7 @@ final public class AndrolibResources { if (!dir.exists()) { if (!dir.mkdirs()) { if (sFrameworkFolder != null) { - System.out.println("Can't create Framework directory: " + System.err.println("Can't create Framework directory: " + dir); } throw new AndrolibException("Can't create directory: " + dir); diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/src/DebugInjector.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/src/DebugInjector.java index 83a3876c..fd94bc42 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/src/DebugInjector.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/src/DebugInjector.java @@ -155,9 +155,9 @@ public class DebugInjector { localType = "D"; break; default: - System.out.println(line); - System.out.println(m.group(2)); - System.out.println(m.group(3)); + System.err.println(line); + System.err.println(m.group(2)); + System.err.println(m.group(3)); assert false; }