Fixed RPMs.

[gpl/argeo-slc.git] / dist / slc / src / main / rpm / usr / bin / slc

diff --git a/dist/slc/src/main/rpm/usr/bin/slc b/dist/slc/src/main/rpm/usr/bin/slc
index 9487c63771fe7191e94c2917e9748d1292bdf863..06bfe5462782369e45b74a59ad315db6c7196318 100644 (file)
--- a/dist/slc/src/main/rpm/usr/bin/slc
+++ b/dist/slc/src/main/rpm/usr/bin/slc
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-JAVA_CMD=/usr/lib/jvm/java-1.6.0/bin/java
+JAVA_CMD=/usr/lib/jvm/jre-1.6.0/bin/java
 JAVA_OPTS="-client -Xmx256m"
 
 SLC_HOME_DIR=${HOME}/.slc/
@@ -9,14 +9,16 @@ if [ -f $SLC_HOME_DIR/settings.sh ];then
 fi
 
 OSGI_INSTALL_AREA=/usr/share/osgi/boot
-OSGI_FRAMEWORK=$OSGI_INSTALL_AREA/org.eclipse.osgi.jar
-OSGI_BOOT=$OSGI_INSTALL_AREA/org.argeo.osgi.boot.jar
-SLC_LAUNCHER=$OSGI_INSTALL_AREA/org.argeo.slc.launcher.jar
 
 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_CMD $JAVA_OPTS \
- "-Dargeo.osgi.bundle=$ARGEO_OSGI_BUNDLES" \
- -cp $OSGI_FRAMEWORK:$OSGI_BOOT \
- -jar $SLC_LAUNCHER "$@"
+ "-Dargeo.osgi.bundles=$ARGEO_OSGI_BUNDLES" \
+ -cp "$CLASSPATH" \
+ org.argeo.slc.cli.SlcMain "$@"
  
\ No newline at end of file