cure symlinked store in /etc/synthetic.conf

much thanks to the eagle-eyed @lilyball for spotting this

Author: abathur

scripts/create-darwin-volume.sh

@@ -206,14 +206,20 @@ test_fstab() {
     /usr/bin/grep -q "$NIX_ROOT apfs rw" /etc/fstab 2>/dev/null
 }
 
-test_nix_symlink() {
-    [ -L "$NIX_ROOT" ] || /usr/bin/grep -q "^nix." /etc/synthetic.conf 2>/dev/null
+test_nix_root_is_symlink() {
+    [ -L "$NIX_ROOT" ]
 }
+
+test_synthetic_conf_either(){
+    /usr/bin/grep -qE "^${NIX_ROOT:1}($|\t.{3,}$)" /etc/synthetic.conf 2>/dev/null
+}
+
 test_synthetic_conf_mountable() {
     /usr/bin/grep -q "^${NIX_ROOT:1}$" /etc/synthetic.conf 2>/dev/null
 }
+
 test_synthetic_conf_symlinked() {
-    /usr/bin/grep -qE "^${NIX_ROOT:1}\s+\S{3,}" /etc/synthetic.conf 2>/dev/null
+    /usr/bin/grep -qE "^${NIX_ROOT:1}\t.{3,}$" /etc/synthetic.conf 2>/dev/null
 }
 
 test_nix_volume_mountd_installed() {
@@ -370,7 +376,26 @@ During install, I add '${NIX_ROOT:1}' to /etc/synthetic.conf, which instructs
 macOS to create an empty root directory for mounting the Nix volume.
 EOF
     # make the edit to a copy
-    /usr/bin/sed -e "/^${NIX_ROOT:1}$/d" "/etc/synthetic.conf" > "$SCRATCH/synthetic.conf.edit"
+    /usr/bin/grep -vE "^${NIX_ROOT:1}($|\t.{3,}$)" /etc/synthetic.conf > "$SCRATCH/synthetic.conf.edit"
+
+    if test_synthetic_conf_symlinked; then
+        warning <<EOF
+
+/etc/synthetic.conf already contains a line instructing your system
+to make '${NIX_ROOT}' as a symlink:
+    $(/usr/bin/grep -nE "^${NIX_ROOT:1}\t.{3,}$" /etc/synthetic.conf)
+
+This may mean your system has/had a non-standard Nix install.
+
+The volume-creation process in this installer is *not* compatible
+with a symlinked store, so I'll have to remove this instruction to
+continue.
+
+If you want/need to keep this instruction, answer 'n' to abort.
+
+EOF
+    fi
+
     # ask to rm if this left the file empty aside from comments, else edit
     if /usr/bin/diff -q <(:) <(/usr/bin/grep -v "^#" "$SCRATCH/synthetic.conf.edit") &>/dev/null; then
         if confirm_rm "/etc/synthetic.conf"; then
@@ -546,7 +571,8 @@ EOF
 }
 
 remove_volume_artifacts() {
-    if test_synthetic_conf_mountable; then
+    if test_synthetic_conf_either; then
+        # NIX_ROOT is in synthetic.conf
         if synthetic_conf_uninstall_prompt; then
             # TODO: moot until we tackle uninstall, but when we're
             # actually uninstalling, we should issue:
@@ -761,7 +787,7 @@ else
             echo ""
         } >&2
 
-        if test_nix_symlink; then
+        if test_nix_root_is_symlink; then
             failure >&2 <<EOF
 error: $NIX_ROOT is a symlink (-> $(readlink "$NIX_ROOT")).
 Please remove it. If nix is in /etc/synthetic.conf, remove it and reboot.