diff -ur bin/admin bin_fixed/admin
--- bin/admin	2013-03-13 10:43:29.575889999 +0200
+++ bin_fixed/admin	2013-03-13 10:58:19.463889999 +0200
@@ -113,7 +113,7 @@
     # In POSIX shells, CDPATH may cause cd to write to stdout
     (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
-    KARAF_HOME=`cd $DIRNAME/..; pwd`
+    KARAF_HOME=`cd "$DIRNAME/.."; pwd`
     if [ ! -d "$KARAF_HOME" ]; then
         die "KARAF_HOME is not valid: $KARAF_HOME"
     fi
@@ -263,7 +263,7 @@
     fi
 
     # Add the jars in the lib dir
-    for file in $KARAF_HOME/lib/*.jar
+    for file in "$KARAF_HOME"/lib/*.jar
     do
         if [ -z "$CLASSPATH" ]; then
             CLASSPATH="$file"
@@ -315,7 +315,7 @@
 
 run() {
 
-    CLASSPATH=${KARAF_HOME}/system/org/apache/karaf/admin/org.apache.karaf.admin.command/2.3.1/org.apache.karaf.admin.command-2.3.1.jar:${KARAF_HOME}/system/org/apache/karaf/admin/org.apache.karaf.admin.core/2.3.1/org.apache.karaf.admin.core-2.3.1.jar:${KARAF_HOME}/system/org/apache/karaf/shell/org.apache.karaf.shell.console/2.3.1/org.apache.karaf.shell.console-2.3.1.jar:${KARAF_HOME}/system/org/apache/aries/blueprint/org.apache.aries.blueprint.api/1.0.0/org.apache.aries.blueprint.api-1.0.0.jar:${KARAF_HOME}/system/org/apache/aries/blueprint/org.apache.aries.blueprint.core/1.1.0/org.apache.aries.blueprint.core-1.1.0.jar:${KARAF_HOME}/system/org/apache/aries/blueprint/org.apache.aries.blueprint.cm/1.0.1/org.apache.aries.blueprint.cm-1.0.1.jar:${KARAF_HOME}/system/org/ops4j/pax/logging/pax-logging-api/1.7.0/pax-logging-api-1.7.0.jar:${KARAF_HOME}/system/org/apache/felix/org.apache.felix.framework/4.0.3/org.apache.felix.framework-4.0.3.jar
+    CLASSPATH="${KARAF_HOME}/system/org/apache/karaf/admin/org.apache.karaf.admin.command/2.3.1/org.apache.karaf.admin.command-2.3.1.jar:${KARAF_HOME}/system/org/apache/karaf/admin/org.apache.karaf.admin.core/2.3.1/org.apache.karaf.admin.core-2.3.1.jar:${KARAF_HOME}/system/org/apache/karaf/shell/org.apache.karaf.shell.console/2.3.1/org.apache.karaf.shell.console-2.3.1.jar:${KARAF_HOME}/system/org/apache/aries/blueprint/org.apache.aries.blueprint.api/1.0.0/org.apache.aries.blueprint.api-1.0.0.jar:${KARAF_HOME}/system/org/apache/aries/blueprint/org.apache.aries.blueprint.core/1.1.0/org.apache.aries.blueprint.core-1.1.0.jar:${KARAF_HOME}/system/org/apache/aries/blueprint/org.apache.aries.blueprint.cm/1.0.1/org.apache.aries.blueprint.cm-1.0.1.jar:${KARAF_HOME}/system/org/ops4j/pax/logging/pax-logging-api/1.7.0/pax-logging-api-1.7.0.jar:${KARAF_HOME}/system/org/apache/felix/org.apache.felix.framework/4.0.3/org.apache.felix.framework-4.0.3.jar"
 
     if $cygwin; then
         KARAF_HOME=`cygpath --path --windows "$KARAF_HOME"`
@@ -323,7 +323,7 @@
         CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
     fi
 
-    exec $JAVA $JAVA_OPTS -Dkaraf.instances="${KARAF_HOME}/instances" -Dkaraf.home="$KARAF_HOME" -Dkaraf.base="$KARAF_BASE" -Djava.io.tmpdir="$KARAF_DATA/tmp" -Djava.util.logging.config.file=$KARAF_BASE/etc/java.util.logging.properties $KARAF_OPTS $OPTS -classpath "$CLASSPATH" org.apache.karaf.admin.main.Execute "$@"
+    exec "$JAVA" $JAVA_OPTS -Dkaraf.instances="${KARAF_HOME}/instances" -Dkaraf.home="$KARAF_HOME" -Dkaraf.base="$KARAF_BASE" -Djava.io.tmpdir="$KARAF_DATA/tmp" -Djava.util.logging.config.file="$KARAF_BASE/etc/java.util.logging.properties" $KARAF_OPTS $OPTS -classpath "$CLASSPATH" org.apache.karaf.admin.main.Execute "$@"
 }
 
 main() {
@@ -332,4 +332,3 @@
 }
 
 main "$@"
-
Only in bin_fixed: admin.orig
diff -ur bin/client bin_fixed/client
--- bin/client	2013-03-13 10:43:29.575889999 +0200
+++ bin_fixed/client	2013-03-13 10:53:52.451889999 +0200
@@ -109,11 +109,11 @@
     if [ "x$KARAF_HOME" != "x" ]; then
         warn "Ignoring predefined value for KARAF_HOME"
     fi
-    
+
     # In POSIX shells, CDPATH may cause cd to write to stdout
     (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
-    KARAF_HOME=`cd $DIRNAME/..; pwd`
+    KARAF_HOME=`cd "$DIRNAME/.."; pwd`
     if [ ! -d "$KARAF_HOME" ]; then
         die "KARAF_HOME is not valid: $KARAF_HOME"
     fi
@@ -290,7 +290,7 @@
         CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
     fi
 
-    exec $JAVA $JAVA_OPTS -Dkaraf.instances="${KARAF_HOME}/instances" -Dkaraf.home="$KARAF_HOME" -Dkaraf.base="$KARAF_BASE" -Djava.io.tmpdir="$KARAF_DATA/tmp" -Djava.util.logging.config.file=$KARAF_BASE/etc/java.util.logging.properties $KARAF_OPTS $OPTS -classpath "$CLASSPATH" org.apache.karaf.client.Main "$@"
+    exec "$JAVA" $JAVA_OPTS -Dkaraf.instances="${KARAF_HOME}/instances" -Dkaraf.home="$KARAF_HOME" -Dkaraf.base="$KARAF_BASE" -Djava.io.tmpdir="$KARAF_DATA/tmp" -Djava.util.logging.config.file="$KARAF_BASE/etc/java.util.logging.properties" $KARAF_OPTS $OPTS -classpath "$CLASSPATH" org.apache.karaf.client.Main "$@"
 }
 
 main() {
Only in bin_fixed: client.orig
diff -ur bin/karaf bin_fixed/karaf
--- bin/karaf	2013-03-13 10:43:29.575889999 +0200
+++ bin_fixed/karaf	2013-03-13 10:52:38.715889999 +0200
@@ -173,7 +173,7 @@
     local bas=`basename "${dst}"`
     local dir=`dirname "${dst}"`
     if [ "$bas" != "$dir" ]; then
-      dst="`pathCanonical "$dir"`/$bas"
+        dst="`pathCanonical "$dir"`/$bas"
     fi
     echo "${dst}" | sed -e 's#//#/#g' -e 's#/./#/#g' -e 's#/[^/]*/../#/#g'
 }
@@ -185,9 +185,9 @@
         [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
     fi
 
-	if [ "x$JAVA_HOME" = "x" ] && [ "$darwin" = "true" ]; then
-		JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home
-	fi
+    if [ "x$JAVA_HOME" = "x" ] && [ "$darwin" = "true" ]; then
+        JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home
+    fi
     if [ "x$JAVA" = "x" ] && [ -r /etc/gentoo-release ] ; then
         JAVA_HOME=`java-config --jre-home`
     fi
@@ -333,7 +333,7 @@
     while [ "$1" != "" ]; do
         case $1 in
             'clean')
-                rm -Rf $KARAF_DATA
+                rm -Rf "$KARAF_DATA"
                 shift
                 ;;
             'debug')
Only in bin_fixed: karaf.orig
diff -ur bin/shell bin_fixed/shell
--- bin/shell	2013-03-13 10:43:29.575889999 +0200
+++ bin_fixed/shell	2013-03-13 11:01:48.499889999 +0200
@@ -112,7 +112,7 @@
     # In POSIX shells, CDPATH may cause cd to write to stdout
     (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
-    KARAF_HOME=`cd $DIRNAME/..; pwd`
+    KARAF_HOME=`cd "$DIRNAME/.."; pwd`
     if [ ! -d "$KARAF_HOME" ]; then
         die "KARAF_HOME is not valid: $KARAF_HOME"
     fi
@@ -315,7 +315,7 @@
         CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
     fi
 
-    exec $JAVA $JAVA_OPTS -Dkaraf.instances="${KARAF_HOME}/instances" -Dkaraf.home="$KARAF_HOME" -Dkaraf.base="$KARAF_BASE" -Djava.io.tmpdir="$KARAF_DATA/tmp" -Djava.util.logging.config.file=$KARAF_BASE/etc/java.util.logging.properties $KARAF_OPTS $OPTS -classpath "$CLASSPATH" org.apache.karaf.shell.console.Main --classpath="$KARAF_HOME/system" "$@"
+    exec "$JAVA" $JAVA_OPTS -Dkaraf.instances="${KARAF_HOME}/instances" -Dkaraf.home="$KARAF_HOME" -Dkaraf.base="$KARAF_BASE" -Djava.io.tmpdir="$KARAF_DATA/tmp" -Djava.util.logging.config.file="$KARAF_BASE/etc/java.util.logging.properties" $KARAF_OPTS $OPTS -classpath "$CLASSPATH" org.apache.karaf.shell.console.Main --classpath="$KARAF_HOME/system" "$@"
 }
 
 main() {
@@ -324,4 +324,3 @@
 }
 
 main "$@"
-
Only in bin_fixed: shell.orig
diff -ur bin/start bin_fixed/start
--- bin/start	2013-03-13 10:43:29.575889999 +0200
+++ bin_fixed/start	2013-03-13 11:03:34.103889999 +0200
@@ -20,7 +20,7 @@
 PROGNAME=`basename "$0"`
 
 #
-# Sourcing environment settings for karaf similar to tomcats setenv 
+# Sourcing environment settings for karaf similar to tomcats setenv
 #
 KARAF_SCRIPT="start"
 export KARAF_SCRIPT
@@ -133,4 +133,3 @@
 }
 
 main "$@"
-
Only in bin_fixed: start.orig