From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 30 May 2023 11:48:45 +0000 (+0200)
Subject: Recognise when running in Eclipse
X-Git-Tag: v2.3.17~1
X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=22b3e039f80d4ea9d72172e51ebe010e8d931118;p=lgpl%2Fargeo-commons.git

Recognise when running in Eclipse
---

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 a3fcf3f80..91a11ee71 100644
--- 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);
@@ -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) {