Change the classpath arguments to be split only by a colon

This commit is contained in:
Ben Gruver 2016-09-05 11:22:32 -07:00
parent c9c8ddb3ef
commit c12b7e6e00
2 changed files with 8 additions and 8 deletions

View File

@ -33,7 +33,7 @@ package org.jf.baksmali;
import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameter;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import org.jf.util.jcommander.CommaColonParameterSplitter; import org.jf.util.jcommander.ColonParameterSplitter;
import org.jf.util.jcommander.ExtendedParameter; import org.jf.util.jcommander.ExtendedParameter;
import java.util.List; import java.util.List;
@ -45,18 +45,18 @@ public class AnalysisArguments {
public int apiLevel = 15; public int apiLevel = 15;
@Parameter(names = {"-b", "--bootclasspath", "--bcp"}, @Parameter(names = {"-b", "--bootclasspath", "--bcp"},
description = "A comma/colon separated list of the jar/oat files to include in the " + description = "A colon separated list of the jar/oat files to include in the " +
"bootclasspath when analyzing the dex file. If not specified, baksmali will attempt to choose an " + "bootclasspath when analyzing the dex file. If not specified, baksmali will attempt to choose an " +
"appropriate default. This is analogous to Android's BOOTCLASSPATH environment variable.", "appropriate default. This is analogous to Android's BOOTCLASSPATH environment variable.",
splitter = CommaColonParameterSplitter.class) splitter = ColonParameterSplitter.class)
@ExtendedParameter(argumentNames = "classpath") @ExtendedParameter(argumentNames = "classpath")
public List<String> bootClassPath = null; public List<String> bootClassPath = null;
@Parameter(names = {"-c", "--classpath", "--cp"}, @Parameter(names = {"-c", "--classpath", "--cp"},
description = "A comma/colon separated list of additional jar/oat files to include in the classpath " + description = "A colon separated list of additional jar/oat files to include in the classpath " +
"when analyzing the dex file. These will be added to the classpath after any bootclasspath " + "when analyzing the dex file. These will be added to the classpath after any bootclasspath " +
"entries.", "entries.",
splitter = CommaColonParameterSplitter.class) splitter = ColonParameterSplitter.class)
@ExtendedParameter(argumentNames = "classpath") @ExtendedParameter(argumentNames = "classpath")
public List<String> classPath = Lists.newArrayList(); public List<String> classPath = Lists.newArrayList();

View File

@ -37,11 +37,11 @@ import java.util.Arrays;
import java.util.List; import java.util.List;
/** /**
* A JCommander parameter splitter that splits a parameter value by either commas or colons * A JCommander parameter splitter that splits a parameter value by colon
*/ */
public class CommaColonParameterSplitter implements IParameterSplitter { public class ColonParameterSplitter implements IParameterSplitter {
@Override @Override
public List<String> split(String value) { public List<String> split(String value) {
return Arrays.asList(value.split(":|,")); return Arrays.asList(value.split(":"));
} }
} }