From 7aa0ad23f4c3fe545be9836eea57b7f37f657654 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Wed, 5 Jun 2019 23:23:59 +0200 Subject: [PATCH] darwin-rebuild: fix activate without an existing profile --- pkgs/nix-tools/darwin-rebuild.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/nix-tools/darwin-rebuild.sh b/pkgs/nix-tools/darwin-rebuild.sh index 4f9213c3..bcbb3196 100644 --- a/pkgs/nix-tools/darwin-rebuild.sh +++ b/pkgs/nix-tools/darwin-rebuild.sh @@ -114,10 +114,14 @@ if [ "$action" = list -o "$action" = rollback ]; then fi fi -if [ "$action" = activate -o "$action" = rollback -o "$action" = check ]; then +if [ "$action" = rollback -o "$action" = check ]; then systemConfig="$(cat $profile/systemConfig)" fi +if [ "$action" = activate ]; then + systemConfig=$(readlink -f "${0%*/sw/bin/darwin-rebuild}") +fi + if [ -z "$systemConfig" ]; then exit 0; fi if [ "$action" = switch ]; then