Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

-f and -settings should not be mandatory as there are sensible defaults #7

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

-f and -settings should not be mandatory as there are sensible defaults #7

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5516fa5
-f and -settings should not be mandatory as there are sensible defaults
jglick Jun 16, 2020
484d0c7
Merge branch 'master' of github.com:jelmerk/maven-settings-decoder in…
jglick Jun 16, 2020
88ca37f
Unused code
jglick Jun 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 5 additions & 15 deletions src/main/java/org/github/jelmerk/maven/settings/Decoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public class Decoder {
private static final String SETTINGS_FILE_LONG_OPT = "settings";
private static final String SETTINGS_FILE_SHORT_OPT = "f";

private static final int MISSING_OR_INVALID_ARGUMENTS_EXIT_CODE = 1;
private static final int INVALID_ARGUMENTS_EXIT_CODE = 1;

public static void main(String... args) throws Exception {

Expand All @@ -37,26 +37,21 @@ public static void main(String... args) throws Exception {
CommandLineParser parser = new PosixParser();
CommandLine commandLine = parser.parse(options, args);

String settingsFileName = commandLine.getOptionValue(SETTINGS_FILE_SHORT_OPT);
String securityFileName = commandLine.getOptionValue(SETTINGS_SECURITY_FILE_SHORT_OPT);

if (settingsFileName == null || securityFileName == null) {
printHelp(options);
System.exit(MISSING_OR_INVALID_ARGUMENTS_EXIT_CODE);
}
String settingsFileName = commandLine.getOptionValue(SETTINGS_FILE_SHORT_OPT, System.getProperty("user.home") + File.separatorChar + ".m2" + File.separatorChar + "settings.xml");
String securityFileName = commandLine.getOptionValue(SETTINGS_SECURITY_FILE_SHORT_OPT, System.getProperty("user.home") + File.separatorChar + ".m2" + File.separatorChar + "settings-security.xml");

File settingsFile = new File(settingsFileName);

if (!settingsFile.exists()) {
System.out.printf("Settings file : %s does not exist%n", settingsFile.getAbsolutePath());
System.exit(MISSING_OR_INVALID_ARGUMENTS_EXIT_CODE);
System.exit(INVALID_ARGUMENTS_EXIT_CODE);
}

File securityFile = new File(securityFileName);

if (!settingsFile.exists()) {
System.out.printf("Security file : %s does not exist%n", securityFile.getAbsolutePath());
System.exit(MISSING_OR_INVALID_ARGUMENTS_EXIT_CODE);
System.exit(INVALID_ARGUMENTS_EXIT_CODE);
}

printPasswords(settingsFile, securityFile);
Expand Down Expand Up @@ -87,11 +82,6 @@ private static Options createOptions() {
return options;
}

private static void printHelp(Options options) {
HelpFormatter formatter = new HelpFormatter();
formatter.printHelp("settings-decoder", options);
}

private static void printPasswords(File settingsFile, File securityFile)
throws IOException, XmlPullParserException, SecDispatcherException, PlexusCipherException {

Expand Down