From ed6c4aabeae2ae8869a647eee04a45372a74ab56 Mon Sep 17 00:00:00 2001 From: Emily Date: Sun, 12 Jan 2025 16:49:02 +0000 Subject: [PATCH] system: remove code for macOS < 11 --- modules/system/base.nix | 75 ++++++++++++++--------------------------- 1 file changed, 25 insertions(+), 50 deletions(-) diff --git a/modules/system/base.nix b/modules/system/base.nix index 2374855a..fb27c545 100644 --- a/modules/system/base.nix +++ b/modules/system/base.nix @@ -2,60 +2,35 @@ { system.activationScripts.createRun.text = '' - IFS="." read -r -a macOSVersion <<< "$(sw_vers -productVersion)" + if [[ $(stat -c '%a' /etc/synthetic.conf) != "644" ]]; then + echo "fixing permissions on /etc/synthetic.conf..." + sudo chmod 644 /etc/synthetic.conf + fi - if [[ ''${macOSVersion[0]} -gt 10 || ( ''${macOSVersion[0]} -eq 10 && ''${macOSVersion[1]} -ge 15 ) ]]; then - if [[ $(stat -c '%a' /etc/synthetic.conf) != "644" ]]; then - echo "fixing permissions on /etc/synthetic.conf..." - sudo chmod 644 /etc/synthetic.conf - fi + if [[ $(grep -c '^run\b' /etc/synthetic.conf) -gt 1 ]]; then + echo "found duplicate run entries in /etc/synthetic.conf, removing..." + sudo sed -i "" -e '/^run\tprivate\/var\/run$/d' /etc/synthetic.conf + fi - if [[ $(grep -c '^run\b' /etc/synthetic.conf) -gt 1 ]]; then - echo "found duplicate run entries in /etc/synthetic.conf, removing..." - sudo sed -i "" -e '/^run\tprivate\/var\/run$/d' /etc/synthetic.conf - fi + if ! grep -q '^run\b' /etc/synthetic.conf 2>/dev/null; then + echo "setting up /run via /etc/synthetic.conf..." + printf 'run\tprivate/var/run\n' | sudo tee -a /etc/synthetic.conf >/dev/null + fi - if ! grep -q '^run\b' /etc/synthetic.conf 2>/dev/null; then - echo "setting up /run via /etc/synthetic.conf..." - printf 'run\tprivate/var/run\n' | sudo tee -a /etc/synthetic.conf >/dev/null - fi + sudo /System/Library/Filesystems/apfs.fs/Contents/Resources/apfs.util -t || true - if [[ ''${macOSVersion[0]} -gt 10 ]]; then - sudo /System/Library/Filesystems/apfs.fs/Contents/Resources/apfs.util -t || true - else - sudo /System/Library/Filesystems/apfs.fs/Contents/Resources/apfs.util -B || true - fi - - if [[ ! -L /run ]]; then - printf >&2 'error: apfs.util failed to symlink /run, aborting activation\n' - printf >&2 'To create a symlink from /run to /var/run, please run:\n' - printf >&2 '\n' - printf >&2 "$ printf 'run\tprivate/var/run\n' | sudo tee -a /etc/synthetic.conf" - - if [[ ''${macOSVersion[0]} -gt 10 ]]; then - printf >&2 '$ sudo /System/Library/Filesystems/apfs.fs/Contents/Resources/apfs.util -t\n' - else - printf >&2 '$ sudo /System/Library/Filesystems/apfs.fs/Contents/Resources/apfs.util -B\n' - fi - - printf >&2 '\n' - printf >&2 'The current contents of /etc/synthetic.conf is:\n' - printf >&2 '\n' - sudo sed 's/^/ /' /etc/synthetic.conf >&2 - printf >&2 '\n' - exit 1 - fi - else - echo "setting up /run..." - sudo ln -sfn private/var/run /run - - if [[ ! -L /run ]]; then - printf >&2 'error: failed to symlink /run, aborting activation\n' - printf >&2 'To create a symlink from /run to /var/run, please run:\n' - printf >&2 '\n' - printf >&2 '$ sudo ln -sfn private/var/link /run\n' - exit 1 - fi + if [[ ! -L /run ]]; then + printf >&2 'error: apfs.util failed to symlink /run, aborting activation\n' + printf >&2 'To create a symlink from /run to /var/run, please run:\n' + printf >&2 '\n' + printf >&2 "$ printf 'run\tprivate/var/run\n' | sudo tee -a /etc/synthetic.conf" + printf >&2 '$ sudo /System/Library/Filesystems/apfs.fs/Contents/Resources/apfs.util -t\n' + printf >&2 '\n' + printf >&2 'The current contents of /etc/synthetic.conf is:\n' + printf >&2 '\n' + sudo sed 's/^/ /' /etc/synthetic.conf >&2 + printf >&2 '\n' + exit 1 fi ''; }