Skip to content

Commit f17e0e8

Browse files
Auto-merge for PR #297 via VersionBot
feat(diskutil): Populate devicePath on Mac OS
2 parents 7ccbeb1 + c75a0fa commit f17e0e8

File tree

4 files changed

+8
-4
lines changed

4 files changed

+8
-4
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file
44
automatically by Versionist. DO NOT EDIT THIS FILE MANUALLY!
55
This project adheres to [Semantic Versioning](http://semver.org/).
66

7+
## v6.4.0 - 2018-08-02
8+
9+
* Feat(diskutil): Populate devicePath on Mac OS #297 [Jonas Hermsmeier]
10+
711
## v6.3.2 - 2018-08-02
812

913
* Fix(diskutil): Also probe Ejectable to determine removabililty #298 [Jonas Hermsmeier]

lib/diskutil.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ const transform = (disk) => {
5656
busType: disk.BusProtocol || 'UNKNOWN',
5757
busVersion: null,
5858
device: disk.DeviceNode,
59-
devicePath: null,
59+
devicePath: disk.DeviceTreePath || null,
6060
raw: disk.DeviceNode && disk.DeviceNode.replace('/disk', '/rdisk'),
6161
description: disk.IORegistryEntryName || disk.MediaName,
6262
error: null,

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "drivelist",
3-
"version": "6.3.2",
3+
"version": "6.4.0",
44
"description": "List all connected drives in your computer, in all major operating systems",
55
"main": "lib/drivelist.js",
66
"homepage": "https://github.com/resin-io-modules/drivelist",

tests/diskutil.spec.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ describe('Drivelist', function() {
4444
busType: 'PCI-Express',
4545
busVersion: null,
4646
device: '/dev/disk1',
47-
devicePath: null,
47+
devicePath: 'IODeviceTree:/PCI0@0/RP17@1B/SSD0@0/IONVMeController',
4848
raw: '/dev/rdisk1',
4949
description: 'Macintosh HD',
5050
error: null,
@@ -98,7 +98,7 @@ describe('Drivelist', function() {
9898
busType: 'USB',
9999
busVersion: null,
100100
device: '/dev/disk3',
101-
devicePath: null,
101+
devicePath: 'IODeviceTree:/PCI0@0/XHC1@14',
102102
raw: '/dev/rdisk3',
103103
description: 'APPLE SD Card Reader Media',
104104
error: null,

0 commit comments

Comments
 (0)