Merge pull request #3 from gyselroth/dev

v1.0.2
gyselroth · Dec 11, 2018 · fe43e25 · fe43e25
2 parents d34e3d1 + 3f5e65a
commit fe43e25
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,17 @@
+## 1.0.2
+**Maintainer**: Raffael Sahli <sahli@gyselroth.net>\
+**Date**: Tue December 11 14:59:22 CET 2018
+
+* [FIX] possibility to specify context.cmd on nodeIcon.setFolderIcon
+
+
+## 1.0.1
+**Maintainer**: Raffael Sahli <sahli@gyselroth.net>\
+**Date**: Tue December 11 14:51:22 CET 2018
+
+* [FEATURE] possibility to specify context.cmd on nodeIcon.setFolderIcon
+
+
 ## 1.0.0
 **Maintainer**: Raffael Sahli <sahli@gyselroth.net>\
 **Date**: Tue December 11 13:48:22 CET 2018

diff --git a/lib/darwin.js b/lib/darwin.js
@@ -21,10 +21,16 @@ async function ensureItem(node, context) {
   return osx.addItem(parsePath(node));
 }
 
-function setFolderIcon(node, icon) {
+function setFolderIcon(node, icon, context) {
   return new Promise(async (resolve, reject) => {
+    var cmd = require.resolve('fileicon/bin/fileicon');
+
+    if(context && context.cmd) {
+      cmd = context.cmd;
+    }
+
     exec([
-      'node_modules/fileicon/bin/fileicon',
+      cmd,
       'set',
       node,
       icon

diff --git a/lib/linux.js b/lib/linux.js
@@ -91,7 +91,7 @@ async function ensureItem(node, context) {
   }
 }
 
-async function setFolderIcon(node, icon) {
+async function setFolderIcon(node, icon, context) {
   return exec([
     'gvfs-set-attribute',
     node,

diff --git a/lib/win32.js b/lib/win32.js
@@ -95,7 +95,7 @@ async function ensureItem(node, context) {
   regKey.set('{'+context.clsId+'}', 'REG_DWORD', '0x1', (result) => {});
 }
 
-function setFolderIcon(node, icon) {
+function setFolderIcon(node, icon, context) {
   var content = "[.ShellClassInfo]\
     ConfirmFileOp=0\
     NoSharing=1\

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@gyselroth/node-advanced-desktop",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "Manage sidebar bookmarks (folder favourites) and folder icons compatible on Linux, Windows and OS X",
   "main": "lib/main.js",
   "scripts": {