X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=dist%2Fslc%2Fsrc%2Fmain%2Frpm%2Fusr%2Fbin%2Fslc;h=06bfe5462782369e45b74a59ad315db6c7196318;hb=dc95cc0fdc36c88e778cdfd52d443d0a0b8d926c;hp=3efd3bc67250a041e891f952cf2678f20820c900;hpb=aee87eeef820af87f18c2cf2e9b86b612393f7db;p=gpl%2Fargeo-slc.git

diff --git a/dist/slc/src/main/rpm/usr/bin/slc b/dist/slc/src/main/rpm/usr/bin/slc
index 3efd3bc67..06bfe5462 100644
--- a/dist/slc/src/main/rpm/usr/bin/slc
+++ b/dist/slc/src/main/rpm/usr/bin/slc
@@ -1,25 +1,24 @@
 #!/bin/sh
 
-OSGI_INSTALL_AREA=/usr/share/osgi/boot
-OSGI_FRAMEWORK=$OSGI_INSTALL_AREA/org.eclipse.osgi.jar
+JAVA_CMD=/usr/lib/jvm/jre-1.6.0/bin/java
+JAVA_OPTS="-client -Xmx256m"
 
-CL_DIR=~/.slc/cl
-DATA_DIR=$CL_DIR/data
-CONF_DIR=$CL_DIR/conf
+SLC_HOME_DIR=${HOME}/.slc/
+if [ -f $SLC_HOME_DIR/settings.sh ];then
+	. $SLC_HOME_DIR/settings.sh
+fi
 
-MODULE=$1
-FLOW=$2
+OSGI_INSTALL_AREA=/usr/share/osgi/boot
 
-if [ ! -f $CONF_DIR/config.ini ];
-then
-	mkdir -p $CONF_DIR
-    cp /etc/slc-cl/config.ini $CONF_DIR
-fi
+ARGEO_OSGI_BUNDLES="$SLC_HOME_DIR/modules;in=**;ex=**/.git/**;ex=**/.svn/**,/etc/slc-cl/modules;in=**;ex=**/.git/**;ex=**/.svn/**,/usr/share/osgi;in=*.jar"
+
+for i in "${OSGI_INSTALL_AREA}"/*.jar
+	do
+	CLASSPATH="$CLASSPATH:$i"
+	done
 
-java -jar $OSGI_FRAMEWORK \
- -configuration $CONF_DIR \
- -data $DATA_DIR \
- -Dslc.launch.module=$MODULE \
- -Dslc.launch.flow=$FLOW \
- -console \
- -clean
+$JAVA_CMD $JAVA_OPTS \
+ "-Dargeo.osgi.bundles=$ARGEO_OSGI_BUNDLES" \
+ -cp "$CLASSPATH" \
+ org.argeo.slc.cli.SlcMain "$@"
+ 
\ No newline at end of file