Fix bash escaping.

petersirka · petersirka · commit dcf343e0b23c · 2016-10-29T10:49:15.000+02:00
diff --git a/image.js b/image.js
@@ -122,7 +122,7 @@ function Image(filename, useImageMagick, width, height) {
 	this.width = width;
 	this.height = height;
 	this.builder = [];
-	this.filename = type === 'string' ? framework_utils.escape_bash(filename) : null;
+	this.filename = type === 'string' ? filename.escape_bash() : null;
 	this.currentStream = type === 'object' ? filename : null;
 	this.isIM = useImageMagick == null ? F.config['default-image-converter'] === 'im' : useImageMagick;
 	this.outputType = type === 'string' ? framework_utils.getExtension(filename) : 'jpg';
@@ -195,7 +195,7 @@ Image.prototype.save = function(filename, callback, writer) {
 		callback = filename;
 		filename = null;
 	} else if (filename)
-		filename = framework_utils.escape_bash(filename);
+		filename = filename.escape_bash();
 
 	!self.builder.length && self.minify();
 	filename = filename || self.filename || '';
@@ -400,7 +400,7 @@ Image.prototype.push = function(key, value, priority, encode) {
 
 	if (value != null) {
 		if (encode && typeof(value) === 'string')
-			cmd += ' "' + framework_utils.escape_bash(value);
+			cmd += ' "' + value.escape_bash();
 		else
 			cmd += ' "' + value + '"';
 	}
diff --git a/index.js b/index.js
@@ -467,7 +467,7 @@ function Framework() {
 
 	this.id = null;
 	this.version = 2200;
-	this.version_header = '2.2.0-7';
+	this.version_header = '2.2.0-8';
 	this.version_node = process.version.toString().replace('v', '').replace(/\./g, '').parseFloat();
 
 	this.config = {
diff --git a/package.json b/package.json
@@ -75,7 +75,7 @@
         "name": "Peter Štolc",
         "email": "stolcp@gmail.com"
     }],
-    "version": "2.2.0-7",
+    "version": "2.2.0-8",
     "homepage": "http://www.totaljs.com",
     "bugs": {
         "url": "https://github.com/totaljs/framework/issues",
