adding back changes to use binaries included

.travis.yml

@@ -1,6 +1,5 @@
 before_install:
   - sudo apt-get update -qq
-  - sudo apt-get install -y p7zip-full
 language: node_js
 node_js:
   - '6'

lib/add.js

@@ -5,7 +5,7 @@ var u    = {
   files   : require('../util/files'),
   run     : require('../util/run'),
   switches: require('../util/switches'),
-  // path    : require('../util/path'),
+  path    : require('../util/path')
 };
 
 /**
@@ -19,12 +19,13 @@ var u    = {
  * @reject {Error} The error as issued by 7-Zip.
  */
 module.exports = function (archive, files, options) {
+    var command = u.path(options);
   return when.promise(function (resolve, reject, progress) {
 
     // Convert array of files into a string if needed.
     files = u.files(files);
 
-    var command = '7z a "' + archive + '" ' + files;
+    command += ' a "' + archive + '" ' + files;
 
     // Start the command
     u.run(command, options)

lib/delete.js

@@ -4,6 +4,7 @@ var u    = {
   files   : require('../util/files'),
   run     : require('../util/run'),
   switches: require('../util/switches'),
+  path    : require('../util/path')
 };
 
 /**
@@ -16,13 +17,14 @@ var u    = {
  * @reject {Error} The error as issued by 7-Zip.
  */
 module.exports = function (archive, files, options) {
+    var command = u.path(options);
   return when.promise(function (resolve, reject) {
 
     // Convert array of files into a string if needed.
     files = u.files(files);
 
     // Create a string that can be parsed by `run`.
-    var command = '7z d "' + archive + '" ' + files;
+    command += ' d "' + archive + '" ' + files;
 
     // Start the command
     u.run(command, options)

lib/extract.js

@@ -3,7 +3,8 @@ var path = require('path');
 var when = require('when');
 var u    = {
   run     : require('../util/run'),
-  switches: require('../util/switches')
+  switches: require('../util/switches'),
+  path    : require('../util/path')
 };
 
 /**
@@ -17,10 +18,11 @@ var u    = {
  * @reject {Error} The error as issued by 7-Zip.
  */
 module.exports = function (archive, dest, options) {
+    var command = u.path(options);
   return when.promise(function (resolve, reject, progress) {
 
     // Create a string that can be parsed by `run`.
-    var command = '7z e "' + archive + '" -o"' + dest + '" ';
+    command += ' e "' + archive + '" -o"' + dest + '" ';
 
     // Start the command
     u.run(command, options)

lib/extractFull.js

@@ -3,7 +3,8 @@ var path = require('path');
 var when = require('when');
 var u    = {
   run     : require('../util/run'),
-  switches: require('../util/switches')
+  switches: require('../util/switches'),
+  path    : require('../util/path')
 };
 
 /**
@@ -17,10 +18,11 @@ var u    = {
  * @reject {Error} The error as issued by 7-Zip.
  */
 module.exports = function (archive, dest, options) {
+    var command = u.path(options);
   return when.promise(function (resolve, reject, progress) {
 
     // Create a string that can be parsed by `run`.
-    var command = '7z x "' + archive + '" -o"' + dest + '" ';
+    command += ' x "' + archive + '" -o"' + dest + '" ';
 
     // Start the command
     u.run(command, options)

lib/index.js

@@ -1,5 +1,17 @@
 'use strict';
 
+function makeExecutable(){
+    var FS = require("fs");
+    var Path = require("path");
+    var macosversion = (process.platform == "darwin") ? require('macos-release').version : '';
+    var binarypath = Path.join(__dirname, "..","binaries", macosversion == '' ? process.platform : process.platform, macosversion );
+    var filePath = Path.join(binarypath, process.platform === "win32" ? '7za.exe' : '7za');
+    if (process.platform !== "win32") {
+        FS.chmodSync(filePath, 755);
+    } 
+    return;
+}
+
 var Zip = function () {};
 
 Zip.prototype.add = require('./add');
@@ -11,3 +23,4 @@ Zip.prototype.test = require('./test');
 Zip.prototype.update = require('./update');
 
 module.exports = Zip;
+makeExecutable();

lib/list.js

@@ -3,7 +3,8 @@ var path = require('path');
 var when = require('when');
 var u    = {
   run     : require('../util/run'),
-  switches: require('../util/switches')
+  switches: require('../util/switches'),
+  path    : require('../util/path')
 };
 
 /**
@@ -16,6 +17,7 @@ var u    = {
  * @reject {Error} The error as issued by 7-Zip.
  */
 module.exports = function (archive, options) {
+    var command = u.path(options);
   return when.promise(function (resolve, reject, progress) {
 
     var spec  = {};
@@ -24,7 +26,7 @@ module.exports = function (archive, options) {
     /* jshint maxlen: 80 */
 
     // Create a string that can be parsed by `run`.
-    var command = '7z l "' + archive + '" ';
+    command += ' l "' + archive + '" ';
 
     var buffer = ""; //Store imcomplete line of a progress data.
     // Start the command

lib/test.js

@@ -3,7 +3,8 @@ var path = require('path');
 var when = require('when');
 var u    = {
   run     : require('../util/run'),
-  switches: require('../util/switches')
+  switches: require('../util/switches'),
+  path    : require('../util/path')
 };
 
 /**
@@ -16,10 +17,11 @@ var u    = {
  * @reject {Error} The error as issued by 7-Zip.
  */
 module.exports = function (archive, options) {
+    var command = u.path(options);
   return when.promise(function (resolve, reject, progress) {
 
     // Create a string that can be parsed by `run`.
-    var command = '7z t "' + archive + '"';
+    command += ' t "' + archive + '"';
 
     // Start the command
     u.run(command, options)

lib/update.js

@@ -3,7 +3,8 @@ var path = require('path');
 var when = require('when');
 var u = {
   run: require('../util/run'),
-  switches : require('../util/switches')
+  switches : require('../util/switches'),
+  path    : require('../util/path')
 };
 
 /**
@@ -17,10 +18,11 @@ var u = {
  * @reject {Error} The error as issued by 7-Zip.
  */
 module.exports = function (archive, files, options) {
+    var command = u.path(options);
   return when.promise(function (resolve, reject, progress) {
 
     // Create a string that can be parsed by `run`.
-    var command = '7z u "' + archive + '" "' + files + '"';
+    command = ' u "' + archive + '" "' + files + '"';
 
     // Start the command
     u.run(command, options)

util/path.js

@@ -1,4 +1,5 @@
 'use strict';
+var path  = require('path');
 
 module.exports = function (options) {
 
@@ -7,8 +8,10 @@ module.exports = function (options) {
 
     if (options.path) {
       return options.path;
-    } else {
-      return '7z';
+    } else {    
+      var macversion = (process.platform == "darwin") ? require('macos-release').version : '';
+      var binarypath = path.join(__dirname, '..','binaries', (macversion=='') ? process.platform : process.platform, macversion);
+      return path.join(binarypath, process.platform === "win32" ? '7za.exe' : '7za');
     }
 
   } catch (e) {

util/run.js

@@ -13,7 +13,16 @@ var utilSwitches = require('./switches');
  * @reject {Error} The error issued by 7-Zip.
  * @reject {number} Exit code issued by 7-Zip.
  */
-module.exports = function (command, switches) {
+module.exports = function (command, switches) {  
+
+    // add platform binary to environment path
+    var envPath = process.env.path;
+    if (envPath.indexOf('7za') < 0) {
+        var macos = (process.platform == "darwin") ? require('macos-release').version : '';
+        var pathto7z = path.join(__dirname, "..","binaries", macos == '' ? process.platform : process.platform, macos );
+        process.env.path += (envPath[envPath.length -1] === ';') ? pathto7z : ';' + pathto7z;
+    }
+
   return when.promise(function (fulfill, reject, progress) {
 
     // Parse the command variable. If the command is not a string reject the