From 1de1a4a6555e4fd0b7f3e9537ef63bd8e27515cb Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Sat, 16 Mar 2024 09:29:57 +0100 Subject: [PATCH] Fix jar branches --- bin/argeo | 2 +- bin/jshc | 2 +- lib/systemd/system/argeo@.service | 2 +- lib/systemd/user/argeo.service | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) 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 -- 2.30.2