From 669d6400d285697d1b23d802fd8cc904f8d9ea93 Mon Sep 17 00:00:00 2001
From: Connor Tumbleson <connor.tumbleson@gmail.com>
Date: Thu, 21 Mar 2013 06:12:35 -0500
Subject: [PATCH] minor cosmetic changes to usage output, added
 publicize-resources

---
 .../src/main/java/brut/apktool/Main.java       | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

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 9d85256b..6f3fb8ca 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
@@ -65,6 +65,7 @@ public class Main {
           usage(commandLine);
           return;
       }
+  		
   		// check for verbose / quiet
 		  if (commandLine.hasOption("-v") || commandLine.hasOption("--verbose")) {
 		    verbosity = Verbosity.VERBOSE;
@@ -435,17 +436,28 @@ public class Main {
           "with smali v" + ApktoolProperties.get("smaliVersion") +
           " and baksmali v" + ApktoolProperties.get("baksmaliVersion") + "\n" +
           "Copyright 2010 Ryszard Wiśniewski <brut.alll@gmail.com>\n" +
-          "Updated by Connor Tumbleson <connor.tumbleson@gmail.com> \n" );
+          "Updated by Connor Tumbleson <connor.tumbleson@gmail.com>" );
+      if (advanceMode) {
+        System.out.println("Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)\n");
+      }else {
+        System.out.println("");
+      }
       
       // 4 usage outputs (general, frameworks, decode, build)
       formatter.printHelp("apktool " + verbosityHelp(), normalOptions);
       formatter.printHelp("apktool " + verbosityHelp() + "if|install-framework [options] <framework.apk>", frameOptions);
 	    formatter.printHelp("apktool " + verbosityHelp() + "d[ecode] [options] <file_apk>", DecodeOptions);
 	    formatter.printHelp("apktool " + verbosityHelp() + "b[uild] [options] <app_path>", BuildOptions);
+	    if (advanceMode) {
+	      formatter.printHelp("apktool " + verbosityHelp() + "publicize-resources <file_path>", 
+	          "Make all framework resources public.", emptyOptions, null);
+	    } else {
+	      System.out.println("");
+	    }
 	    
 	    // print out more information
 	    System.out.println(
-	            "\nFor additional info, see: http://code.google.com/p/android-apktool/ \n"
+	            "For additional info, see: http://code.google.com/p/android-apktool/ \n"
             + "For smali/baksmali info, see: http://code.google.com/p/smali/");
 	}
 
@@ -495,6 +507,7 @@ public class Main {
   private final static Options BuildOptions;
   private final static Options frameOptions;
   private final static Options allOptions;
+  private final static Options emptyOptions;
   
   static {
     //normal and advance usage output
@@ -503,5 +516,6 @@ public class Main {
     DecodeOptions = new Options();
     frameOptions = new Options();
     allOptions = new Options();
+    emptyOptions = new Options();
   }
 }