From 083bb3bbfcdccebd06bde81a66f158d51ed6e455 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Thu, 13 Feb 2020 12:57:35 +0100
Subject: install: show macOS 10.15 message with --daemon

---
 scripts/create-darwin-volume.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'scripts/create-darwin-volume.sh')

diff --git a/scripts/create-darwin-volume.sh b/scripts/create-darwin-volume.sh
index f3e0d46f1..d6fb44f43 100755
--- a/scripts/create-darwin-volume.sh
+++ b/scripts/create-darwin-volume.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 set -e
 
-root_disks() {
-    diskutil list -plist /
+root_disk() {
+    diskutil info -plist /
 }
 
 apfs_volumes_for() {
@@ -11,7 +11,7 @@ apfs_volumes_for() {
 }
 
 disk_identifier() {
-    xpath "/plist/dict/key[text()='WholeDisks']/following-sibling::array[1]/string/text()" 2>/dev/null
+    xpath "/plist/dict/key[text()='ParentWholeDisk']/following-sibling::string[1]/text()" 2>/dev/null
 }
 
 volume_get() {
@@ -81,7 +81,7 @@ main() {
         sudo mkdir /nix
     fi
 
-    disk=$(root_disks | disk_identifier)
+    disk=$(root_disk | disk_identifier)
     volume=$(find_nix_volume "$disk")
     if [ -z "$volume" ]; then
         echo "Creating a Nix Store volume..." >&2
-- 
cgit v1.2.3