X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fde%2Ftodesbaum%2Fjsite%2Fmain%2FCLI.java;h=0780e9fbdd6de3a79b8a031f5a5b1b71f2a1cc4c;hb=21eb9e153f17fb0820ef1815a72f57d2068b145b;hp=c97d8e13f2c6368dd61eff7e900fbce4e337a3fb;hpb=3c46627c143cb41527eb05b2e91d10feb12dd914;p=jSite.git diff --git a/src/de/todesbaum/jsite/main/CLI.java b/src/de/todesbaum/jsite/main/CLI.java index c97d8e1..0780e9f 100644 --- a/src/de/todesbaum/jsite/main/CLI.java +++ b/src/de/todesbaum/jsite/main/CLI.java @@ -89,11 +89,11 @@ public class CLI implements InsertListener { } } - Configuration configuration = new Configuration(configFile); - if (!configuration.createLockFile()) { - outputWriter.println("Lock file found!"); - return; + ConfigurationLocator configurationLocator = new ConfigurationLocator(); + if (configFile != null) { + configurationLocator.setCustomLocation(configFile); } + Configuration configuration = new Configuration(configurationLocator, configurationLocator.findPreferredLocation()); projectInserter.addInsertListener(this); projects = configuration.getProjects(); @@ -157,9 +157,11 @@ public class CLI implements InsertListener { } } + int errorCode = 1; if (currentProject != null) { if (insertProject(currentProject)) { outputWriter.println("Project \"" + currentProject.getName() + "\" successfully inserted."); + errorCode = 0; } else { outputWriter.println("Project \"" + currentProject.getName() + "\" was not successfully inserted."); } @@ -167,6 +169,8 @@ public class CLI implements InsertListener { configuration.setProjects(projects); configuration.save(); + + System.exit(errorCode); } /**