Merge tag 'v2.3.17' into testing

[lgpl/argeo-commons.git] / org.argeo.cms.jshell / src / org / argeo / cms / jshell / CmsJShell.java

diff --git a/org.argeo.cms.jshell/src/org/argeo/cms/jshell/CmsJShell.java b/org.argeo.cms.jshell/src/org/argeo/cms/jshell/CmsJShell.java
index e3718ae73119f693d99c78441e194d9bf7199255..91a11ee71d3a2ec59fadffe8fb513a53dedc4e4e 100644 (file)
--- a/org.argeo.cms.jshell/src/org/argeo/cms/jshell/CmsJShell.java
+++ b/org.argeo.cms.jshell/src/org/argeo/cms/jshell/CmsJShell.java
@@ -40,7 +40,12 @@ public class CmsJShell {
 
        public void start() throws Exception {
                // TODO better define application id, make it configurable
-               String applicationID = cmsState.getStatePath("").getFileName().toString();
+               String applicationID;
+               if (Files.exists(cmsState.getStatePath("dev.properties"))) { // in Eclipse
+                       applicationID = cmsState.getStatePath("").getFileName().toString();
+               } else {
+                       applicationID = cmsState.getStatePath("").getParent().getFileName().toString();
+               }
 
                // TODO centralise state run dir
                stateRunDir = OS.getRunDir().resolve(applicationID);
@@ -54,7 +59,7 @@ public class CmsJShell {
                jtermLinkedDir = Files.createSymbolicLink(cmsState.getStatePath(JShellClient.JTERM), jtermBase);
 
                log.info("Local JShell on " + jshBase + ", linked to " + jshLinkedDir);
-               log.info("Local JTerml on " + jtermBase + ", linked to " + jtermLinkedDir);
+               log.info("Local JTerm on " + jtermBase + ", linked to " + jtermLinkedDir);
 
                new Thread(() -> {
                        try {
@@ -154,6 +159,11 @@ public class CmsJShell {
                } catch (IOException e) {
                        log.error("Cannot remove " + jshLinkedDir);
                }
+               try {
+                       Files.delete(jtermLinkedDir);
+               } catch (IOException e) {
+                       log.error("Cannot remove " + jtermLinkedDir);
+               }
        }
 
        public void setCmsState(CmsState cmsState) {