From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sat, 16 Mar 2024 08:29:57 +0000 (+0100)
Subject: Fix jar branches
X-Git-Tag: v2.1.4^0
X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-freed.git;a=commitdiff_plain;h=1de1a4a6555e4fd0b7f3e9537ef63bd8e27515cb

Fix jar branches
---

diff --git a/bin/argeo b/bin/argeo
index f3a6d5a..3079a0d 100755
--- a/bin/argeo
+++ b/bin/argeo
@@ -1,2 +1,2 @@
 #!/bin/sh
-java -Dorg.argeo.api.cli.rootCommand=$0 -jar /usr/local/share/a2/org.argeo.cms/org.argeo.cms.cli.2.3.jar "$@"
\ No newline at end of file
+java -Dorg.argeo.api.cli.rootCommand=$0 -jar /usr/local/share/a2/org.argeo.cms/org.argeo.cms.cli.2.1.jar "$@"
\ No newline at end of file
diff --git a/bin/jshc b/bin/jshc
index 0060646..57c13a8 100755
--- a/bin/jshc
+++ b/bin/jshc
@@ -1,2 +1,2 @@
 #!/bin/sh
-java -Xms32m -Xmx64m -jar /usr/local/share/a2/org.argeo.cms/org.argeo.cms.jshell.2.3.jar "$@"
\ No newline at end of file
+java -Xms32m -Xmx64m -jar /usr/local/share/a2/org.argeo.cms/org.argeo.cms.jshell.2.1.jar "$@"
\ No newline at end of file
diff --git a/lib/systemd/system/argeo@.service b/lib/systemd/system/argeo@.service
index c70ea58..e0acc06 100644
--- a/lib/systemd/system/argeo@.service
+++ b/lib/systemd/system/argeo@.service
@@ -31,7 +31,7 @@ ExecStart=java \
 @/usr/local/etc/argeo/jvm.args \
 @${CONFIGURATION_DIRECTORY}/../jvm.args \
 @${CONFIGURATION_DIRECTORY}/jvm.args \
--cp "/usr/local/share/a2/osgi/equinox/org.argeo.tp.osgi/org.eclipse.osgi.3.18.jar:/usr/local/share/a2/org.argeo.cms/org.argeo.init.2.3.jar" \
+-cp "/usr/local/share/a2/osgi/equinox/org.argeo.tp.osgi/org.eclipse.osgi.3.18.jar:/usr/local/share/a2/org.argeo.cms/org.argeo.init.2.1.jar" \
 org.argeo.init.ServiceMain
  
 # Exit codes of the JVM when SIGTERM or SIGINT have been caught:
diff --git a/lib/systemd/user/argeo.service b/lib/systemd/user/argeo.service
index f6783f0..9bfde9e 100644
--- a/lib/systemd/user/argeo.service
+++ b/lib/systemd/user/argeo.service
@@ -20,7 +20,7 @@ ExecStart=java \
 @/usr/local/etc/argeo/jvm.args \
 @/usr/local/etc/argeo/user/jvm.args \
 @${CONFIGURATION_DIRECTORY}/jvm.args \
--cp "/usr/local/share/a2/osgi/equinox/org.argeo.tp.osgi/org.eclipse.osgi.3.18.jar:/usr/local/share/a2/org.argeo.cms/org.argeo.init.2.3.jar:/usr/local/lib/a2/org.argeo.slc/*:/usr/local/lib/a2/org.argeo.tp.sys/*:/usr/local/lib/a2/swt/rcp/org.argeo.tp.swt/*" \
+-cp "/usr/local/share/a2/osgi/equinox/org.argeo.tp.osgi/org.eclipse.osgi.3.18.jar:/usr/local/share/a2/org.argeo.cms/org.argeo.init.2.1.jar:/usr/local/lib/a2/org.argeo.slc/*:/usr/local/lib/a2/org.argeo.tp.sys/*:/usr/local/lib/a2/swt/rcp/org.argeo.tp.swt/*" \
 org.argeo.init.RuntimeManagerMain \
 etc/argeo/user/slc