X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=dist%2Fargeo-node%2Fbase%2Fbin%2Fargeo-cms;h=bf3afa21642151748cd651e86f8a47bf56ed6267;hb=4185ff8826f893a4a1f054f61a11b89333c3e85d;hp=9819b7e772950d17c8671bcf8f909800dc1ede1f;hpb=1091271b89f2d12e9898e01f6639c48831b1bc4b;p=lgpl%2Fargeo-commons.git

diff --git a/dist/argeo-node/base/bin/argeo-cms b/dist/argeo-node/base/bin/argeo-cms
index 9819b7e77..bf3afa216 100755
--- a/dist/argeo-node/base/bin/argeo-cms
+++ b/dist/argeo-node/base/bin/argeo-cms
@@ -4,20 +4,20 @@ APP=argeo
 JVM=java
 
 BIN_DIR=`dirname "$0"`
-BASE_DIR=$BIN_DIR/..
+BASE_DIR="$(cd "$(dirname "$0")/.."; pwd -P)"
+#BASE_DIR=$BIN_DIR/..
 
 # Directories and files
 CONF_DIR=$BASE_DIR/etc/$APP
 CONF_DIRS=$CONF_DIR/conf.d
-#BASE_POLICY_ALL=/usr/share/$APP/all.policy
 BASE_CONFIG_INI=$BASE_DIR/share/$APP/config.ini
 
-#EXEC_DIR=$BASE_DIR/var/lib/$APP
 EXEC_DIR=.
 DATA_DIR=$EXEC_DIR/data
 CONF_RW=$EXEC_DIR/state
 CONFIG_INI=$CONF_RW/config.ini
 
+A2_SOURCES=a2://$BASE_DIR/share/osgi
 OSGI_INSTALL_AREA=$BASE_DIR/share/osgi/boot
 OSGI_FRAMEWORK=$OSGI_INSTALL_AREA/org.eclipse.osgi.jar
 
@@ -33,7 +33,7 @@ start() {
 	mkdir -p $DATA_DIR
 
     # Merge config files
-    printf "## Equinox configuration - Generated by /usr/sbin/nodectl ##\n\n" > $CONFIG_INI
+    printf "## Equinox configuration - Generated by argeo-cms ##\n\n" > $CONFIG_INI
     cat $BASE_CONFIG_INI >> $CONFIG_INI
     printf "\n##\n## $CONF_DIR/$APP.ini\n##\n\n" >> $CONFIG_INI
     cat $CONF_DIR/$APP.ini >> $CONFIG_INI
@@ -46,6 +46,7 @@ start() {
 	$JVM \
 		-Dlog4j.configuration="file:$CONF_DIR/log4j.properties" \
 		$JAVA_OPTS -jar $OSGI_FRAMEWORK \
+		-Dargeo.osgi.sources=$A2_SOURCES \
 		-configuration "$CONF_RW" \
 		-data "$DATA_DIR"
 }
@@ -128,6 +129,6 @@ case "$1" in
 	status
         ;;
   *)
-        echo $"Usage: $0 {start|stop|status}"
-        exit 1
+        start
+        ;;
 esac
\ No newline at end of file