You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2010/12/20 11:44:56 UTC
svn commit: r1051045 -
/karaf/branches/karaf-2.1.x/assembly/src/main/distribution/unix-shell/bin/karaf
Author: gnodet
Date: Mon Dec 20 10:44:56 2010
New Revision: 1051045
URL: http://svn.apache.org/viewvc?rev=1051045&view=rev
Log:
[KARAF-321] araf shell script does not work with mingw and whitespaces in path
Modified:
karaf/branches/karaf-2.1.x/assembly/src/main/distribution/unix-shell/bin/karaf
Modified: karaf/branches/karaf-2.1.x/assembly/src/main/distribution/unix-shell/bin/karaf
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.1.x/assembly/src/main/distribution/unix-shell/bin/karaf?rev=1051045&r1=1051044&r2=1051045&view=diff
==============================================================================
--- karaf/branches/karaf-2.1.x/assembly/src/main/distribution/unix-shell/bin/karaf (original)
+++ karaf/branches/karaf-2.1.x/assembly/src/main/distribution/unix-shell/bin/karaf Mon Dec 20 10:44:56 2010
@@ -256,7 +256,7 @@ setupDefaults() {
fi
# Add the jars in the lib dir
- for file in $KARAF_HOME/lib/karaf*.jar
+ for file in "$KARAF_HOME"/lib/karaf*.jar
do
if [ -z "$CLASSPATH" ]; then
CLASSPATH="$file"
@@ -337,8 +337,8 @@ run() {
KARAF_DATA=`cygpath --path --windows "$KARAF_DATA"`
CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
fi
- cd $KARAF_BASE
- exec $JAVA $JAVA_OPTS -Djava.endorsed.dirs="${JAVA_HOME}/jre/lib/endorsed:${JAVA_HOME}/lib/endorsed:${KARAF_HOME}/lib/endorsed" -Djava.ext.dirs="${JAVA_HOME}/jre/lib/ext:${JAVA_HOME}/lib/ext:${KARAF_HOME}/lib/ext" -Dkaraf.instances="${KARAF_HOME}/instances" -Dkaraf.home="$KARAF_HOME" -Dkaraf.base="$KARAF_BASE" -Dkaraf.data="$KARAF_DATA" -Djava.util.logging.config.file=$KARAF_BASE/etc/java.util.logging.properties $OPTS -classpath "$CLASSPATH" $MAIN "$@"
+ cd "$KARAF_BASE"
+ exec "$JAVA" $JAVA_OPTS -Djava.endorsed.dirs="${JAVA_HOME}/jre/lib/endorsed:${JAVA_HOME}/lib/endorsed:${KARAF_HOME}/lib/endorsed" -Djava.ext.dirs="${JAVA_HOME}/jre/lib/ext:${JAVA_HOME}/lib/ext:${KARAF_HOME}/lib/ext" -Dkaraf.instances="${KARAF_HOME}/instances" -Dkaraf.home="$KARAF_HOME" -Dkaraf.base="$KARAF_BASE" -Dkaraf.data="$KARAF_DATA" -Djava.util.logging.config.file="$KARAF_BASE/etc/java.util.logging.properties" $OPTS -classpath "$CLASSPATH" $MAIN "$@"
}
main() {