Argeo Companion launcher.

[gpl/argeo-slc.git] / rcp / dist / argeo-companion / rpm / usr / bin / argeo-companion

diff --git a/rcp/dist/argeo-companion/rpm/usr/bin/argeo-companion b/rcp/dist/argeo-companion/rpm/usr/bin/argeo-companion
index ab25dc79e2123daf17db6e53b4bb75fa356b23aa..c48beb80f2659456e784d28fdfcf70eb8ecf1df8 100755 (executable)
--- a/rcp/dist/argeo-companion/rpm/usr/bin/argeo-companion
+++ b/rcp/dist/argeo-companion/rpm/usr/bin/argeo-companion
@@ -5,18 +5,14 @@ JVM=java
 
 # Directories and files
 CONF_DIR=/etc/$APP
-CONF_DIRS=/etc/$APP/conf.d
-BASE_POLICY_ALL=/usr/share/$APP/all.policy
-BASE_CONFIG_INI=/usr/share/$APP/config.ini
 
-EXEC_DIR=$HOME/.local/share/argeo-companion
+EXEC_DIR=$HOME/.local/share/$APP
 DATA_DIR=$EXEC_DIR/data
 CONF_RW=$EXEC_DIR/state
-CONFIG_INI=$CONF_RW/config.ini
 
+A2_SOURCES=a2:///usr/share/osgi,a2:///usr/lib/osgi
 OSGI_INSTALL_AREA=/usr/share/osgi/boot
 OSGI_FRAMEWORK=$OSGI_INSTALL_AREA/org.eclipse.osgi.jar
-ECLIPSE_LAUNCHER=$OSGI_INSTALL_AREA/org.eclipse.equinox.launcher.jar
 
 # Overwrite variables
 if [ -f $CONF_DIR/settings.sh ];then
@@ -28,27 +24,17 @@ RETVAL=0
 start() {
        mkdir -p $CONF_RW
        mkdir -p $DATA_DIR
-
-    # Merge config files
-    printf "## Equinox configuration - Generated by /usr/sbin/nodectl ##\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
-    for file in `ls -v $CONF_DIRS/*.ini`; do
-            printf "\n##\n## $file\n##\n\n" >> $CONFIG_INI
-            cat $file >> $CONFIG_INI
-    done;
-
-#              $JAVA_OPTS -jar $OSGI_FRAMEWORK \
+       
+       cp $CONF_DIR/argeo-companion.ini $CONF_RW/config.ini
 
        cd $EXEC_DIR
        $JVM \
                -Dlog4j.configuration="file:$CONF_DIR/log4j.properties" \
-               -Dosgi.framework=$OSGI_FRAMEWORK \
-               $JAVA_OPTS -classpath $ECLIPSE_LAUNCHER org.eclipse.equinox.launcher.Main \
+               -Dargeo.osgi.sources=$A2_SOURCES \
+               $JAVA_OPTS -jar $OSGI_FRAMEWORK \
+               -console \
                -configuration "$CONF_RW" \
                -data "$DATA_DIR"
 }
 
-start
-
+start
\ No newline at end of file