Index: assembly/src/main/distribution/unix-shell/bin/karaf
===================================================================
--- assembly/src/main/distribution/unix-shell/bin/karaf	(revision 1044365)
+++ assembly/src/main/distribution/unix-shell/bin/karaf	(working copy)
@@ -256,7 +256,7 @@
     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 @@
         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() {