Author: jbonofre
Date: Fri Apr 12 08:13:57 2013
New Revision: 1467199
URL: http://svn.apache.org/r1467199
Log:
[KARAF-2236] Fix scripts when path contain spaces
Modified:
karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/karaf
karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/bin/admin
karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/bin/client
karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/bin/shell
Modified:
karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/karaf
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/karaf?rev=1467199&r1=1467198&r2=1467199&view=diff
==============================================================================
---
karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/karaf
(original)
+++
karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/karaf
Fri Apr 12 08:13:57 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/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/bin/admin
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/bin/admin?rev=1467199&r1=1467198&r2=1467199&view=diff
==============================================================================
---
karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/bin/admin
(original)
+++
karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/bin/admin
Fri Apr 12 08:13:57 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
@@ -315,7 +315,7 @@ init() {
run() {
-
CLASSPATH=${KARAF_HOME}/system/org/apache/karaf/admin/org.apache.karaf.admin.command/${project.version}/org.apache.karaf.admin.command-${project.version}.jar:${KARAF_HOME}/system/org/apache/karaf/admin/org.apache.karaf.admin.core/${project.version}/org.apache.karaf.admin.core-${project.version}.jar:${KARAF_HOME}/system/org/apache/karaf/shell/org.apache.karaf.shell.console/${project.version}/org.apache.karaf.shell.console-${project.version}.jar:${KARAF_HOME}/system/org/apache/aries/blueprint/org.apache.aries.blueprint.api/${aries.blueprint.api.version}/org.apache.aries.blueprint.api-${aries.blueprint.api.version}.jar:${KARAF_HOME}/system/org/apache/aries/blueprint/org.apache.aries.blueprint.core/${aries.blueprint.core.version}/org.apache.aries.blueprint.core-${aries.blueprint.core.version}.jar:${KARAF_HOME}/system/org/apache/aries/blueprint/org.apache.aries.blueprint.cm/${aries.blueprint.cm.version}/org.apache.aries.blueprint.cm-${aries.blueprint.cm.version}.jar:${KARAF_H
OME}/system/org/ops4j/pax/logging/pax-logging-api/${pax.logging.version}/pax-logging-api-${pax.logging.version}.jar:${KARAF_HOME}/system/org/apache/felix/org.apache.felix.framework/${felix.framework.version}/org.apache.felix.framework-${felix.framework.version}.jar
+
CLASSPATH="${KARAF_HOME}/system/org/apache/karaf/admin/org.apache.karaf.admin.command/${project.version}/org.apache.karaf.admin.command-${project.version}.jar:${KARAF_HOME}/system/org/apache/karaf/admin/org.apache.karaf.admin.core/${project.version}/org.apache.karaf.admin.core-${project.version}.jar:${KARAF_HOME}/system/org/apache/karaf/shell/org.apache.karaf.shell.console/${project.version}/org.apache.karaf.shell.console-${project.version}.jar:${KARAF_HOME}/system/org/apache/aries/blueprint/org.apache.aries.blueprint.api/${aries.blueprint.api.version}/org.apache.aries.blueprint.api-${aries.blueprint.api.version}.jar:${KARAF_HOME}/system/org/apache/aries/blueprint/org.apache.aries.blueprint.core/${aries.blueprint.core.version}/org.apache.aries.blueprint.core-${aries.blueprint.core.version}.jar:${KARAF_HOME}/system/org/apache/aries/blueprint/org.apache.aries.blueprint.cm/${aries.blueprint.cm.version}/org.apache.aries.blueprint.cm-${aries.blueprint.cm.version}.jar:${KARAF_
HOME}/system/org/ops4j/pax/logging/pax-logging-api/${pax.logging.version}/pax-logging-api-${pax.logging.version}.jar:${KARAF_HOME}/system/org/apache/felix/org.apache.felix.framework/${felix.framework.version}/org.apache.felix.framework-${felix.framework.version}.jar"
if $cygwin; then
KARAF_HOME=`cygpath --path --windows "$KARAF_HOME"`
@@ -323,7 +323,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.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() {
Modified:
karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/bin/client
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/bin/client?rev=1467199&r1=1467198&r2=1467199&view=diff
==============================================================================
---
karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/bin/client
(original)
+++
karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/bin/client
Fri Apr 12 08:13:57 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
@@ -290,7 +290,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.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() {
Modified:
karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/bin/shell
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/bin/shell?rev=1467199&r1=1467198&r2=1467199&view=diff
==============================================================================
---
karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/bin/shell
(original)
+++
karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/bin/shell
Fri Apr 12 08:13:57 2013
@@ -112,7 +112,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
@@ -315,7 +315,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.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() {
