jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fschumac...@apache.org
Subject svn commit: r1814735 - in /jmeter/trunk/bin: jmeter jmeter.sh
Date Thu, 09 Nov 2017 14:48:37 GMT
Author: fschumacher
Date: Thu Nov  9 14:48:37 2017
New Revision: 1814735

URL: http://svn.apache.org/viewvc?rev=1814735&view=rev
Log:
Try to guard against spaces in path and reuse logic to calculate real path of the start script

Modified:
    jmeter/trunk/bin/jmeter
    jmeter/trunk/bin/jmeter.sh

Modified: jmeter/trunk/bin/jmeter
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/jmeter?rev=1814735&r1=1814734&r2=1814735&view=diff
==============================================================================
--- jmeter/trunk/bin/jmeter (original)
+++ jmeter/trunk/bin/jmeter Thu Nov  9 14:48:37 2017
@@ -77,15 +77,6 @@ if [ "$CURRENT_VERSION" -gt "$MINIMAL_VE
     ADD_MODS="--add-modules java.activation"
 fi
 
-JMETER_OPTS=""
-case `uname` in
-   Darwin*)
-   # Add Mac-specific property - should be ignored elsewhere (Bug 47064)
-   JMETER_OPTS="-Xdock:name=JMeter -Xdock:icon="`dirname $0`/../docs/images/jmeter_square.png"
-Dapple.laf.useScreenMenuBar=true -Dapple.eawt.quitStrategy=CLOSE_ALL_WINDOWS"
-   ;;
-esac
-
-
 # resolve links - $0 may be a softlink (code as used by Tomcat)
 # N.B. readlink would be a lot simpler but is not supported on Solaris
 PRG="$0"
@@ -102,6 +93,15 @@ done
 
 PRGDIR=`dirname "$PRG"`
 
+JMETER_OPTS=""
+case `uname` in
+   Darwin*)
+   # Add Mac-specific property - should be ignored elsewhere (Bug 47064)
+   JMETER_OPTS="-Xdock:name=JMeter -Xdock:icon=\"${PRGDIR}/../docs/images/jmeter_square.png\"
-Dapple.laf.useScreenMenuBar=true -Dapple.eawt.quitStrategy=CLOSE_ALL_WINDOWS"
+   ;;
+esac
+
+
 #
 # Original page has disappeared, it is now only available at:
 # https://web.archive.org/web/20060614151434/http://www.atg.com/portal/myatg/developer?paf_dm=full&paf_gear_id=1100010&detailArticle=true&id=9606

Modified: jmeter/trunk/bin/jmeter.sh
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/jmeter.sh?rev=1814735&r1=1814734&r2=1814735&view=diff
==============================================================================
--- jmeter/trunk/bin/jmeter.sh (original)
+++ jmeter/trunk/bin/jmeter.sh Thu Nov  9 14:48:37 2017
@@ -45,15 +45,6 @@ if [ $current_version ]; then
          exit 1
 fi
 
-JMETER_OPTS=""
-case `uname` in
-   Darwin*)
-   # Add Mac-specific property - should be ignored elsewhere (Bug 47064)
-   JMETER_OPTS="-Xdock:name=JMeter -Xdock:icon="`dirname $0`/../docs/images/jmeter_square.png"
-Dapple.laf.useScreenMenuBar=true -Dapple.eawt.quitStrategy=CLOSE_ALL_WINDOWS"
-   ;;
-esac
-
-
 # resolve links - $0 may be a softlink (code as used by Tomcat)
 # N.B. readlink would be a lot simpler but is not supported on Solaris
 PRG="$0"
@@ -70,4 +61,13 @@ done
 
 PRGDIR=`dirname "$PRG"`
 
+JMETER_OPTS=""
+case `uname` in
+   Darwin*)
+   # Add Mac-specific property - should be ignored elsewhere (Bug 47064)
+   JMETER_OPTS="-Xdock:name=JMeter -Xdock:icon=\"${PRGDIR}/../docs/images/jmeter_square.png\"
-Dapple.laf.useScreenMenuBar=true -Dapple.eawt.quitStrategy=CLOSE_ALL_WINDOWS"
+   ;;
+esac
+
+
 java $JVM_ARGS $JMETER_OPTS -jar "$PRGDIR/ApacheJMeter.jar" "$@"



Mime
View raw message