Fix for Empty JAVA executable path and JAVA path with spaces (#426)

szepeviktor · Feb 27, 2017 · 466bda3 · 466bda3
1 parent 8fd5901
commit 466bda3
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/lib/Minify/Minify/YUICompressor.php b/lib/Minify/Minify/YUICompressor.php
@@ -125,7 +125,14 @@ private static function _getCmd($userOptions, $type, $tmpFile)
             )
             ,$userOptions
         );
-        $cmd = self::$javaExecutable
+
+        $javaExecutable = self::$javaExecutable;
+
+        if( false !== strpos(trim($javaExecutable), ' ') ){
+        	$javaExecutable = '"'.$javaExecutable.'"';
+        }
+
+        $cmd = $javaExecutable
 	         . (!empty($o['stack-size'])
 	            ? ' -Xss' . $o['stack-size']
 	            : '')

diff --git a/pub/js/options.js b/pub/js/options.js
@@ -1153,24 +1153,24 @@ jQuery(function() {
             case 'yuijs':
                 jQuery.extend(params, {
                     engine: 'yuijs',
-                    path_java: jQuery('#minify__yuijs__path__java').val(),
-                    path_jar: jQuery('#minify__yuijs__path__jar').val()
+                    path_java: jQuery('#minify_yuijs_path_java').val(),
+                    path_jar: jQuery('#minify_yuijs_path_jar').val()
                 });
                 break;
 
             case 'yuicss':
                 jQuery.extend(params, {
                     engine: 'yuicss',
-                    path_java: jQuery('#minify__yuicss__path__java').val(),
-                    path_jar: jQuery('#minify__yuicss__path__jar').val()
+                    path_java: jQuery('#minify_yuicss_path_java').val(),
+                    path_jar: jQuery('#minify_yuicss_path_jar').val()
                 });
                 break;
 
             case 'ccjs':
                 jQuery.extend(params, {
                     engine: 'ccjs',
-                    path_java: jQuery('#minify__ccjs__path__java').val(),
-                    path_jar: jQuery('#minify__ccjs__path__jar').val()
+                    path_java: jQuery('#minify_ccjs_path_java').val(),
+                    path_jar: jQuery('#minify_ccjs_path_jar').val()
                 });
                 break;
             case 'googleccjs':