Author: jbonofre
Date: Fri Apr 12 07:49:38 2013
New Revision: 1467193
URL: http://svn.apache.org/r1467193
Log:
[KARAF-2236] Fix scripts when path contain spaces
Modified:
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/karaf
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/shell
Modified:
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/karaf
URL:
http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/karaf?rev=1467193&r1=1467192&r2=1467193&view=diff
==============================================================================
---
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/karaf
(original)
+++
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/karaf
Fri Apr 12 07:49:38 2013
@@ -333,7 +333,7 @@ run() {
while [ "$1" != "" ]; do
case $1 in
'clean')
- rm -Rf $KARAF_DATA
+ rm -Rf "$KARAF_DATA"
shift
;;
'debug')
Modified:
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/shell
URL:
http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/shell?rev=1467193&r1=1467192&r2=1467193&view=diff
==============================================================================
---
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/shell
(original)
+++
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/shell
Fri Apr 12 07:49:38 2013
@@ -113,7 +113,7 @@ locateHome() {
# 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
@@ -317,7 +317,7 @@ run() {
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.impl.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.impl.Main --classpath="$KARAF_HOME/system" "$@"
}
main() {
