Skip to content

Commit

Permalink
Auto-merge for PR balena-io-modules#297 via VersionBot
Browse files Browse the repository at this point in the history
feat(diskutil): Populate devicePath on Mac OS
  • Loading branch information
resin-io-modules-versionbot[bot] authored Aug 2, 2018
2 parents 7ccbeb1 + c75a0fa commit f17e0e8
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 4 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file
automatically by Versionist. DO NOT EDIT THIS FILE MANUALLY!
This project adheres to [Semantic Versioning](http://semver.org/).

## v6.4.0 - 2018-08-02

* Feat(diskutil): Populate devicePath on Mac OS #297 [Jonas Hermsmeier]

## v6.3.2 - 2018-08-02

* Fix(diskutil): Also probe Ejectable to determine removabililty #298 [Jonas Hermsmeier]
Expand Down
2 changes: 1 addition & 1 deletion lib/diskutil.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ const transform = (disk) => {
busType: disk.BusProtocol || 'UNKNOWN',
busVersion: null,
device: disk.DeviceNode,
devicePath: null,
devicePath: disk.DeviceTreePath || null,
raw: disk.DeviceNode && disk.DeviceNode.replace('/disk', '/rdisk'),
description: disk.IORegistryEntryName || disk.MediaName,
error: null,
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "drivelist",
"version": "6.3.2",
"version": "6.4.0",
"description": "List all connected drives in your computer, in all major operating systems",
"main": "lib/drivelist.js",
"homepage": "https://github.com/resin-io-modules/drivelist",
Expand Down
4 changes: 2 additions & 2 deletions tests/diskutil.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ describe('Drivelist', function() {
busType: 'PCI-Express',
busVersion: null,
device: '/dev/disk1',
devicePath: null,
devicePath: 'IODeviceTree:/PCI0@0/RP17@1B/SSD0@0/IONVMeController',
raw: '/dev/rdisk1',
description: 'Macintosh HD',
error: null,
Expand Down Expand Up @@ -98,7 +98,7 @@ describe('Drivelist', function() {
busType: 'USB',
busVersion: null,
device: '/dev/disk3',
devicePath: null,
devicePath: 'IODeviceTree:/PCI0@0/XHC1@14',
raw: '/dev/rdisk3',
description: 'APPLE SD Card Reader Media',
error: null,
Expand Down

0 comments on commit f17e0e8

Please sign in to comment.