Эх сурвалжийг харах

Fixed the deploy command.

By default, the deploy command would unpack the zip files from the build
command to the source directory.

* changed the default deploy directories to the actual default deploy
directories
HorridoJoho 2 жил өмнө
parent
commit
7a358cdfd7

+ 1 - 0
src/main/java/com/l2jserver/cli/command/AbstractCommand.java

@@ -39,6 +39,7 @@ public abstract class AbstractCommand implements Runnable {
 
 	protected static final String DEFAULT_LOGIN_DEPLOY_DIR = "./l2j/deploy/login";
 	protected static final String DEFAULT_GAME_DEPLOY_DIR = "./l2j/deploy/game";
+	protected static final String DEFAULT_DATAPACK_DEPLOY_DIR = DEFAULT_GAME_DEPLOY_DIR;
 
 	protected static final FilterInputStream FILTER_INPUT_STREAM = new FilterInputStream(System.in) {
 		@Override

+ 6 - 6
src/main/java/com/l2jserver/cli/command/DeployCommand.java

@@ -51,12 +51,12 @@ public class DeployCommand extends AbstractCommand {
 	@Option(names = {"--datapack-source-directory", "-dpsrc"}, defaultValue = DEFAULT_DATAPACK_SOURCE_DIR, description = "DataPack directory")
 	private String datapackSourceDirectory = DEFAULT_DATAPACK_SOURCE_DIR;
 
-	@Option(names = {"--login-deploy-directory", "-lsdepl"}, defaultValue = DEFAULT_LOGIN_SOURCE_DIR, description = "Login directory")
-	private String loginDeployDirectory = DEFAULT_LOGIN_SOURCE_DIR;
-	@Option(names = {"--game-deploy-directory", "-gsdepl"}, defaultValue = DEFAULT_GAME_SOURCE_DIR, description = "Game directory")
-	private String gameDeployDirectory = DEFAULT_GAME_SOURCE_DIR;
-	@Option(names = {"--datapack-deploy-directory", "-dpdepl"}, defaultValue = DEFAULT_DATAPACK_SOURCE_DIR, description = "DataPack directory")
-	private String datapackDeployDirectory = DEFAULT_DATAPACK_SOURCE_DIR;
+	@Option(names = {"--login-deploy-directory", "-lsdepl"}, defaultValue = DEFAULT_LOGIN_DEPLOY_DIR, description = "Login directory")
+	private String loginDeployDirectory = DEFAULT_LOGIN_DEPLOY_DIR;
+	@Option(names = {"--game-deploy-directory", "-gsdepl"}, defaultValue = DEFAULT_GAME_DEPLOY_DIR, description = "Game directory")
+	private String gameDeployDirectory = DEFAULT_GAME_DEPLOY_DIR;
+	@Option(names = {"--datapack-deploy-directory", "-dpdepl"}, defaultValue = DEFAULT_DATAPACK_DEPLOY_DIR, description = "DataPack directory")
+	private String datapackDeployDirectory = DEFAULT_DATAPACK_DEPLOY_DIR;
 	
 	@Override
 	public void run() {