Enhance AppConfiguration and ApplicationPathResolver to support dev profile, update version to 1.0.2, and modify installation path logic

Author: andre-carbajal

CHANGELOG.md

@@ -1,2 +1,2 @@
-- Call to apis refactored
-- Update version fixed
+- If the CLI is reinstalled and if it was added to PATH previously, it will not be added again.
+- When using a dev profile a different location will be used

pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>net.andrecarbajal</groupId>
     <artifactId>mine-control-cli</artifactId>
-    <version>1.0.1</version>
+    <version>1.0.2</version>
     <name>mine-control-cli</name>
     <description>A powerful CLI tool to create, manage, and run Minecraft servers effortlessly.</description>
     <url/>

setup.iss

@@ -1,5 +1,5 @@
 #define MyAppName "MineControl CLI"
-#define MyAppVersion "1.0.1"
+#define MyAppVersion "1.0.2"
 #define MyAppPublisher "Andre Carbajal"
 #define MyAppExeName "mine-control-cli.exe"
 
@@ -20,14 +20,37 @@ WizardStyle=modern
 Source: "target\mine-control-cli.exe"; DestDir: "{app}"; Flags: ignoreversion
 Source: "target\*.dll"; DestDir: "{app}"; Flags: ignoreversion
 
-[Registry]
-Root: HKLM; Subkey: "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"; \
-    ValueType: expandsz; ValueName: "Path"; ValueData: "{olddata};{app}"
+[Code]
+procedure ModifyPath();
+var
+  Path: string;
+  AppDir: string;
+begin
+  if not RegQueryStringValue(HKLM, 'SYSTEM\CurrentControlSet\Control\Session Manager\Environment', 'Path', Path) then
+  begin
+    Exit;
+  end;
 
-[Run]
-Filename: "{sys}\cmd.exe"; \
-    Parameters: "/C setx PATH ""%PATH%;{app}"""; \
-    Flags: runhidden
+  AppDir := ExpandConstant('{app}');
+
+  if Pos(LowerCase(AppDir), LowerCase(Path)) = 0 then
+  begin
+    if Pos(';', Path[Length(Path)]) <> 0 then
+      Path := Path + AppDir
+    else
+      Path := Path + ';' + AppDir;
+
+    RegWriteExpandStringValue(HKLM, 'SYSTEM\CurrentControlSet\Control\Session Manager\Environment', 'Path', Path);
+  end;
+end;
+
+procedure CurStepChanged(CurStep: TSetupStep);
+begin
+  if CurStep = ssPostInstall then
+  begin
+    ModifyPath();
+  end;
+end;
 
 [UninstallDelete]
 Type: files; Name: "{app}\*.*"

src/main/java/net/andrecarbajal/mine_control_cli/config/AppConfiguration.java

@@ -11,6 +11,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
+import org.springframework.core.env.Environment;
 
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -26,9 +27,9 @@ public class AppConfiguration {
     private Path instancesPath;
     private Path backupsPath;
 
-    public AppConfiguration(ApplicationProperties applicationProperties) {
+    public AppConfiguration(ApplicationProperties applicationProperties, Environment environment) {
         this.applicationProperties = applicationProperties;
-        this.applicationPathResolver = new ApplicationPathResolver(applicationProperties);
+        this.applicationPathResolver = new ApplicationPathResolver(applicationProperties, environment);
         this.updateChecker = new UpdateChecker(applicationProperties);
     }
 

src/main/java/net/andrecarbajal/mine_control_cli/config/path/ApplicationPathResolver.java

@@ -2,16 +2,19 @@
 
 import net.andrecarbajal.mine_control_cli.config.ApplicationProperties;
 import net.andrecarbajal.mine_control_cli.util.system.OsChecker;
+import org.springframework.core.env.Environment;
 
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
 public class ApplicationPathResolver {
     private final ApplicationProperties applicationProperties;
+    private final Environment environment;
 
-    public ApplicationPathResolver(ApplicationProperties applicationProperties) {
+    public ApplicationPathResolver(ApplicationProperties applicationProperties, Environment environment) {
         this.applicationProperties = applicationProperties;
+        this.environment = environment;
     }
 
     public Path getApplicationPath() {
@@ -21,7 +24,13 @@ public Path getApplicationPath() {
             default -> System.getProperty("user.home");
         };
 
-        return Paths.get(baseFolder, applicationProperties.getName());
+        String appName = applicationProperties.getName();
+
+        if (environment.matchesProfiles("dev")) {
+            appName += "-dev";
+        }
+
+        return Paths.get(baseFolder, appName);
     }
 
     public void createApplicationPath() {
@@ -42,4 +51,4 @@ public Path createSubdirectory(String subdirectory) {
             throw new RuntimeException("Error creating " + subdirectory + " directory", e);
         }
     }
-}
+}

src/main/resources/application-dev.yml

@@ -0,0 +1,25 @@
+spring:
+  profiles:
+    active: dev
+  application:
+    name: @project.artifactId@
+    version: @project.version@
+  main:
+    banner-mode: off
+  shell:
+    history:
+      enabled: false
+    interactive:
+      enabled: true
+    command:
+      quit:
+        enabled: false
+      history:
+        enabled: false
+      version:
+        show-build-name: true
+        show-build-group: true
+
+logging:
+  level:
+    root: off