Auto-merge for PR #246 via VersionBot

fix(darwin): Allow mountpoints containing space characters

CHANGELOG.md

@@ -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.0.1 - 2018-01-12
+
+* Fix(darwin): Allow mountpoints containing space characters #246 [Andrew Scheller]
+
 ## v6.0.0 - 2018-01-05
 
 * Feat: Rewrite native bindings to use IOCTL #243 [Jonas Hermsmeier]

lib/scripts.json

@@ -1,6 +1,6 @@
 {
   "darwin": {
-    "content": "#!/bin/bash\n\nset -u\nset -e\n\nget_key() {\n\n  # This expression is intentionally unquoted so that\n  # multiple lines get joined as a single one.\n  # See https://github.com/resin-io-modules/drivelist/pull/129\n  echo $(grep \"$1\" | awk -F \"  +\" '{ print $3 }')\n\n}\n\nget_until_paren() {\n  awk 'match($0, \"\\\\(|$\"){ print substr($0, 0, RSTART - 1) }'\n}\n\nDISKS=\"$(diskutil list | grep '^\\/' | get_until_paren)\"\nmount_output=\"$(mount)\"\n\nfor disk in $DISKS; do\n\n  # Ignore drives that were just unplugged\n  if ! diskinfo=\"$(diskutil info \"$disk\")\"; then\n    continue\n  fi\n\n  device=\"$(echo \"$diskinfo\" | get_key \"Device Node\")\"\n\n  # See http://superuser.com/q/631592\n  raw_device=\"${device//disk/rdisk}\"\n\n  description=\"$(echo \"$diskinfo\" | get_key \"Device / Media Name\")\"\n  volume_name=\"$(echo \"$diskinfo\" | get_key \"Volume Name\")\"\n  removable=\"$(echo \"$diskinfo\" | get_key \"Removable Media\")\"\n  protected=\"$(echo \"$diskinfo\" | get_key \"Read-Only Media\")\"\n  location=\"$(echo \"$diskinfo\" | get_key \"Device Location\")\"\n  size=\"$(echo \"$diskinfo\" | sed 's/Disk Size/Total Size/g' | get_key \"Total Size\" | cut -d '(' -f 2 | cut -d ' ' -f 1)\"\n\n  mountpoints=\"$(echo \"$mount_output\" | grep -E \"^${disk}(s[0-9]+)? on \" | cut -d ' ' -f 3)\"\n\n  # Omit mounted DMG images\n  if [[ \"$description\" == \"Disk Image\" ]]; then\n    continue\n  fi\n\n  echo \"enumerator: diskutil\"\n  echo \"busType: UNKNOWN\"\n  echo \"busVersion: \\\"0.0\\\"\"\n  echo \"device: $device\"\n  echo \"raw: $raw_device\"\n\n  if [[ $volume_name =~ .*Not\\ applicable.* ]]; then\n    echo \"description: \\\"$description\\\"\"\n  else\n    echo \"description: \\\"$volume_name - $description\\\"\"\n  fi\n\n  echo \"error: null\"\n  echo \"size: $size\"\n  echo \"blockSize: null\"\n  echo \"logicalBlockSize: null\"\n\n  if [[ -z \"$mountpoints\" ]]; then\n    echo \"mountpoints: []\"\n  else\n    echo \"mountpoints:\"\n    echo \"$mountpoints\" | while read -r mountpoint ; do\n      echo \"  - path: \\\"$mountpoint\\\"\"\n    done\n  fi\n\n  if [[ \"$protected\" == \"Yes\" ]]; then\n    echo \"isReadOnly: True\"\n  else\n    echo \"isReadOnly: False\"\n  fi\n\n  if [[ \"$device\" == \"/dev/disk0\" ]] || \\\n     [[ ( \"$removable\" == \"No\" ) || (\"$removable\" == \"Fixed\") ]] || \\\n     [[ ( \"$location\" =~ \"Internal\" ) && ( \"$removable\" != \"Yes\" ) && ( \"$removable\" != \"Removable\" ) ]] || \\\n     echo \"$mountpoints\" | grep \"^/$\"\n  then\n    echo \"isSystem: True\"\n  else\n    echo \"isSystem: False\"\n  fi\n\n  echo \"isVirtual: null\"\n  echo \"isRemovable: null\"\n  echo \"isCard: null\"\n  echo \"isSCSI: null\"\n  echo \"isUSB: null\"\n  echo \"isUAS: null\"\n\n  echo \"\"\ndone\n",
+    "content": "#!/bin/bash\n\nset -u\nset -e\n\nget_key() {\n\n  # This expression is intentionally unquoted so that\n  # multiple lines get joined as a single one.\n  # See https://github.com/resin-io-modules/drivelist/pull/129\n  echo $(grep \"$1\" | awk -F \"  +\" '{ print $3 }')\n\n}\n\nget_until_paren() {\n  awk 'match($0, \"\\\\(|$\"){ print substr($0, 0, RSTART - 1) }'\n}\n\nDISKS=\"$(diskutil list | grep '^\\/' | get_until_paren)\"\nmount_output=\"$(mount)\"\n\nfor disk in $DISKS; do\n\n  # Ignore drives that were just unplugged\n  if ! diskinfo=\"$(diskutil info \"$disk\")\"; then\n    continue\n  fi\n\n  device=\"$(echo \"$diskinfo\" | get_key \"Device Node\")\"\n\n  # See http://superuser.com/q/631592\n  raw_device=\"${device//disk/rdisk}\"\n\n  description=\"$(echo \"$diskinfo\" | get_key \"Device / Media Name\")\"\n  volume_name=\"$(echo \"$diskinfo\" | get_key \"Volume Name\")\"\n  removable=\"$(echo \"$diskinfo\" | get_key \"Removable Media\")\"\n  protected=\"$(echo \"$diskinfo\" | get_key \"Read-Only Media\")\"\n  location=\"$(echo \"$diskinfo\" | get_key \"Device Location\")\"\n  size=\"$(echo \"$diskinfo\" | sed 's/Disk Size/Total Size/g' | get_key \"Total Size\" | cut -d '(' -f 2 | cut -d ' ' -f 1)\"\n\n  mountpoints=\"$(echo \"$mount_output\" | grep -E \"^${disk}(s[0-9]+)? on \" | sed -r -e \"s| \\([^\\(]+$||\" -e \"s|^${disk}(s[0-9]+)? on ||\")\"\n\n  # Omit mounted DMG images\n  if [[ \"$description\" == \"Disk Image\" ]]; then\n    continue\n  fi\n\n  echo \"enumerator: diskutil\"\n  echo \"busType: UNKNOWN\"\n  echo \"busVersion: \\\"0.0\\\"\"\n  echo \"device: $device\"\n  echo \"raw: $raw_device\"\n\n  if [[ $volume_name =~ .*Not\\ applicable.* ]]; then\n    echo \"description: \\\"$description\\\"\"\n  else\n    echo \"description: \\\"$volume_name - $description\\\"\"\n  fi\n\n  echo \"error: null\"\n  echo \"size: $size\"\n  echo \"blockSize: null\"\n  echo \"logicalBlockSize: null\"\n\n  if [[ -z \"$mountpoints\" ]]; then\n    echo \"mountpoints: []\"\n  else\n    echo \"mountpoints:\"\n    echo \"$mountpoints\" | while read -r mountpoint ; do\n      echo \"  - path: \\\"$mountpoint\\\"\"\n    done\n  fi\n\n  if [[ \"$protected\" == \"Yes\" ]]; then\n    echo \"isReadOnly: True\"\n  else\n    echo \"isReadOnly: False\"\n  fi\n\n  if [[ \"$device\" == \"/dev/disk0\" ]] || \\\n     [[ ( \"$removable\" == \"No\" ) || (\"$removable\" == \"Fixed\") ]] || \\\n     [[ ( \"$location\" =~ \"Internal\" ) && ( \"$removable\" != \"Yes\" ) && ( \"$removable\" != \"Removable\" ) ]] || \\\n     echo \"$mountpoints\" | grep \"^/$\"\n  then\n    echo \"isSystem: True\"\n  else\n    echo \"isSystem: False\"\n  fi\n\n  echo \"isVirtual: null\"\n  echo \"isRemovable: null\"\n  echo \"isCard: null\"\n  echo \"isSCSI: null\"\n  echo \"isUSB: null\"\n  echo \"isUAS: null\"\n\n  echo \"\"\ndone\n",
     "originalFilename": "darwin.sh",
     "type": "text"
   },

package.json

@@ -1,6 +1,6 @@
 {
   "name": "drivelist",
-  "version": "6.0.0",
+  "version": "6.0.1",
   "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",

scripts/darwin.sh

@@ -38,7 +38,7 @@ for disk in $DISKS; do
   location="$(echo "$diskinfo" | get_key "Device Location")"
   size="$(echo "$diskinfo" | sed 's/Disk Size/Total Size/g' | get_key "Total Size" | cut -d '(' -f 2 | cut -d ' ' -f 1)"
 
-  mountpoints="$(echo "$mount_output" | grep -E "^${disk}(s[0-9]+)? on " | cut -d ' ' -f 3)"
+  mountpoints="$(echo "$mount_output" | grep -E "^${disk}(s[0-9]+)? on " | sed -r -e "s| \([^\(]+$||" -e "s|^${disk}(s[0-9]+)? on ||")"
 
   # Omit mounted DMG images
   if [[ "$description" == "Disk Image" ]]; then