Bump denymount version and delete redundant patch (chore task)

Change-type: patch
Signed-off-by: Paulo Castro <paulo@balena.io>
This commit is contained in:
Paulo Castro 2019-05-23 01:29:54 +01:00
parent 6e7f51758e
commit c204dbd6cd
3 changed files with 9 additions and 41 deletions

View File

@ -205,6 +205,7 @@ module.exports =
root: true
action: (params, options, done) ->
Promise = require('bluebird')
path = require('path')
umount = require('umount')
umountAsync = Promise.promisify(umount.umount)
isMountedAsync = Promise.promisify(umount.isMounted)
@ -217,7 +218,12 @@ module.exports =
return if not isMounted
umountAsync(params.target)
.then (configurationSchema) ->
denymount params.target, (cb) ->
dmOpts = {}
if process.pkg
# when running in a standalone pkg install, the 'denymount'
# executable is placed on the same folder as process.execPath
dmOpts.executablePath = path.join(path.dirname(process.execPath), 'denymount')
dmHandler = (cb) ->
reconfix.readConfiguration(configurationSchema, params.target)
.then(getConfiguration)
.then (answers) ->
@ -225,6 +231,7 @@ module.exports =
removeHostname(configurationSchema)
reconfix.writeConfiguration(configurationSchema, answers, params.target)
.asCallback(cb)
denymount params.target, dmHandler, dmOpts
.then ->
console.log('Done!')
.asCallback(done)

View File

@ -139,7 +139,7 @@
"color-hash": "^1.0.3",
"columnify": "^1.5.2",
"common-tags": "^1.7.2",
"denymount": "~2.2.0",
"denymount": "^2.3.0",
"docker-progress": "^4.0.0",
"docker-qemu-transpose": "^0.5.3",
"docker-toolbelt": "^3.3.7",
@ -201,7 +201,6 @@
},
"optionalDependencies": {
"net-keepalive": "^1.2.1",
"removedrive": "^1.0.0",
"windosu": "^0.2.0"
}
}

View File

@ -1,38 +0,0 @@
diff --git a/node_modules/denymount/lib/index.js b/node_modules/denymount/lib/index.js
index 93b8e59..86d53dc 100644
--- a/node_modules/denymount/lib/index.js
+++ b/node_modules/denymount/lib/index.js
@@ -24,7 +24,9 @@ var utils = require('./utils');
* @module denymount
*/
-var EXECUTABLE_PATH = path.join(__dirname, '..', 'bin', 'denymount');
+var EXECUTABLE_PATH = process.pkg
+ ? path.join(path.dirname(process.execPath), 'denymount')
+ : path.join(__dirname, '..', 'bin', 'denymount');
/**
* @summary Prevent automatic mounting of an OS X disk
diff --git a/node_modules/denymount/lib/index.js.rej b/node_modules/denymount/lib/index.js.rej
new file mode 100644
index 0000000..a2c0516
--- /dev/null
+++ b/node_modules/denymount/lib/index.js.rej
@@ -0,0 +1,17 @@
+***************
+*** 24,30 ****
+ * @module denymount
+ */
+
+- var EXECUTABLE_PATH = path.join(__dirname, '..', 'bin', 'denymount');
+
+ /**
+ * @summary Prevent automatic mounting of an OS X disk
+--- 24,30 ----
+ * @module denymount
+ */
+
++ var EXECUTABLE_PATH = path.join(path.dirname(process.execPath), 'denymount', 'bin', 'denymount');
+
+ /**
+ * @summary Prevent automatic mounting of an OS X disk