#654 backslash-escaped file names on command line cause error in Linux: rollback of loki's change

This commit is contained in:
honfika@gmail.com
2014-09-03 23:20:44 +02:00
parent 9d7689d7c9
commit 07959c878f

View File

@@ -49,17 +49,10 @@ while [ -L "$PROGRAM" ]; do
done
cd "`dirname \"$PROGRAM\"`"
PARAMS=""
for PARAM in "$@"
do
PARAMS="${PARAMS} \"${PARAM}\""
done
# Check default java
if [ -x "`which java`" ]; then
JAVA_VERSION_OUTPUT=`java -version 2>&1`
check_java_version && exec java -Djava.net.preferIPv4Stack=true -Xmx$MEMORY -jar $JAR_FILE ${PARAMS}
check_java_version && exec java -Djava.net.preferIPv4Stack=true -Xmx$MEMORY -jar $JAR_FILE $@
fi
# Test other possible Java locations
@@ -68,7 +61,7 @@ for JRE_PATH in $LOOKUP_JRE_DIRS; do
JAVA_VERSION_OUTPUT=`"$JRE_PATH/bin/java" -version 2>&1`
check_java_version && {
export JRE_PATH
exec $JRE_PATH/bin/java -Djava.net.preferIPv4Stack=true -Xmx$MEMORY -jar $JAR_FILE ${PARAMS}
exec $JRE_PATH/bin/java -Djava.net.preferIPv4Stack=true -Xmx$MEMORY -jar $JAR_FILE $@
}
fi
done