X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fde%2Ftodesbaum%2Fjsite%2Fmain%2FCLI.java;h=40f16df00e660679bbed47a44207fc21eb8fe108;hb=a6bda7a82aa1b2cfd0313fb28d3dcca68ca516c5;hp=2c5edbd8f44f10a24a646c5ceff3349643e87de6;hpb=31631440145ea2e26fccfcaeedf17f27b5071f9c;p=jSite.git

diff --git a/src/de/todesbaum/jsite/main/CLI.java b/src/de/todesbaum/jsite/main/CLI.java
index 2c5edbd..40f16df 100644
--- a/src/de/todesbaum/jsite/main/CLI.java
+++ b/src/de/todesbaum/jsite/main/CLI.java
@@ -1,6 +1,5 @@
 /*
- * jSite -
- * Copyright (C) 2006 David Roden
+ * jSite - CLI.java - Copyright © 2006–2011 David Roden
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -89,11 +88,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();